📝 Add docstrings to main

Docstrings generation was requested by @ZhaoZuohong. * https://github.com/QuantumNous/new-api/pull/2279#issuecomment-3568907431 The following files were modified: * `relay/channel/openai/helper.go` * `relay/channel/openai/reasoning_converter.go` * `relay/channel/openai/relay-openai.go`
2026-03-31 23:05:26 +00:00 · 2025-11-24 04:41:04 +00:00
241 changed files with 3161 additions and 37083 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,5 +6,4 @@
 Makefile
 docs
 .eslintcache
-.gocache
-/web/node_modules
+.gocache
--- a/.env.example
+++ b/.env.example
@@ -9,14 +9,6 @@
 # ENABLE_PPROF=true
 # 启用调试模式
 # DEBUG=true
-# Pyroscope 配置
-# PYROSCOPE_URL=http://localhost:4040
-# PYROSCOPE_APP_NAME=new-api
-# PYROSCOPE_BASIC_AUTH_USER=your-user
-# PYROSCOPE_BASIC_AUTH_PASSWORD=your-password
-# PYROSCOPE_MUTEX_RATE=5
-# PYROSCOPE_BLOCK_RATE=5
-# HOSTNAME=your-hostname

 # 数据库相关配置
 # 数据库连接字符串
--- a/.gitignore
+++ b/.gitignore
@@ -16,14 +16,8 @@ new-api
 tiktoken_cache
 .eslintcache
 .gocache
-.gomodcache/
 .cache
 web/bun.lock
-plans

 electron/node_modules
 electron/dist
-data/
-.gomodcache/
-.gocache-temp
-.gopath
--- a/9
+++ b/9
@@ -14,7 +14,7 @@ ENV GO111MODULE=on CGO_ENABLED=0
 ARG TARGETOS
 ARG TARGETARCH
 ENV GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH:-amd64}
-ENV GOEXPERIMENT=greenteagc
+

 WORKDIR /build

@@ -25,11 +25,10 @@ COPY . .
 COPY --from=builder /build/dist ./web/dist
 RUN go build -ldflags "-s -w -X 'github.com/QuantumNous/new-api/common.Version=$(cat VERSION)'" -o new-api

-FROM debian:bookworm-slim
+FROM alpine

-RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates tzdata libasan8 wget \
-    && rm -rf /var/lib/apt/lists/* \
+RUN apk upgrade --no-cache \
+    && apk add --no-cache ca-certificates tzdata \
    && update-ca-certificates

 COPY --from=builder2 /build/new-api /
--- a/README.en.md
+++ b/README.en.md
@@ -146,7 +146,7 @@ docker run --name new-api -d --restart always \

 🎉 After deployment is complete, visit `http://localhost:3000` to start using!

-📖 For more deployment methods, please refer to [Deployment Guide](https://docs.newapi.pro/en/docs/installation)
+📖 For more deployment methods, please refer to [Deployment Guide](https://docs.newapi.pro/installation)

 ---

@@ -154,7 +154,7 @@ docker run --name new-api -d --restart always \

 <div align="center">

-### 📖 [Official Documentation](https://docs.newapi.pro/en/docs) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)
+### 📖 [Official Documentation](https://docs.newapi.pro/) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)

 </div>

@@ -162,17 +162,17 @@ docker run --name new-api -d --restart always \

 | Category | Link |
 |------|------|
-| 🚀 Deployment Guide | [Installation Documentation](https://docs.newapi.pro/en/docs/installation) |
-| ⚙️ Environment Configuration | [Environment Variables](https://docs.newapi.pro/en/docs/installation/config-maintenance/environment-variables) |
-| 📡 API Documentation | [API Documentation](https://docs.newapi.pro/en/docs/api) |
-| ❓ FAQ | [FAQ](https://docs.newapi.pro/en/docs/support/faq) |
-| 💬 Community Interaction | [Communication Channels](https://docs.newapi.pro/en/docs/support/community-interaction) |
+| 🚀 Deployment Guide | [Installation Documentation](https://docs.newapi.pro/installation) |
+| ⚙️ Environment Configuration | [Environment Variables](https://docs.newapi.pro/installation/environment-variables) |
+| 📡 API Documentation | [API Documentation](https://docs.newapi.pro/api) |
+| ❓ FAQ | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 Community Interaction | [Communication Channels](https://docs.newapi.pro/support/community-interaction) |

 ---

 ## ✨ Key Features

-> For detailed features, please refer to [Features Introduction](https://docs.newapi.pro/en/docs/guide/wiki/basic-concepts/features-introduction)
+> For detailed features, please refer to [Features Introduction](https://docs.newapi.pro/wiki/features-introduction)

 ### 🎨 Core Functions

@@ -201,11 +201,11 @@ docker run --name new-api -d --restart always \
 ### 🚀 Advanced Features

 **API Format Support:**
- ⚡ [OpenAI Responses](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-response)
- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/en/docs/api/ai-model/realtime/create-realtime-session) (including Azure)
- ⚡ [Claude Messages](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message)
- ⚡ [Google Gemini](https://doc.newapi.pro/en/api/google-gemini-chat)
- 🔄 [Rerank Models](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank) (Cohere, Jina)
+- ⚡ [OpenAI Responses](https://docs.newapi.pro/api/openai-responses)
+- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/api/openai-realtime) (including Azure)
+- ⚡ [Claude Messages](https://docs.newapi.pro/api/anthropic-chat)
+- ⚡ [Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)
+- 🔄 [Rerank Models](https://docs.newapi.pro/api/jinaai-rerank) (Cohere, Jina)

 **Intelligent Routing:**
 - ⚖️ Channel weighted random
@@ -238,7 +238,6 @@ docker run --name new-api -d --restart always \
 - `gemini-2.5-flash-nothinking` - Disable thinking mode
 - `gemini-2.5-pro-thinking` - Enable thinking mode
 - `gemini-2.5-pro-thinking-128` - Enable thinking mode with thinking budget of 128 tokens
- You can also append `-low`, `-medium`, or `-high` to any Gemini model name to request the corresponding reasoning effort (no extra thinking-budget suffix needed).

 </details>

@@ -246,16 +245,16 @@ docker run --name new-api -d --restart always \

 ## 🤖 Model Support

-> For details, please refer to [API Documentation - Relay Interface](https://docs.newapi.pro/en/docs/api)
+> For details, please refer to [API Documentation - Relay Interface](https://docs.newapi.pro/api)

 | Model Type | Description | Documentation |
 |---------|------|------|
 | 🤖 OpenAI GPTs | gpt-4-gizmo-* series | - |
-| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [Documentation](https://doc.newapi.pro/en/api/midjourney-proxy-image) |
-| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [Documentation](https://doc.newapi.pro/en/api/suno-music) |
-| 🔄 Rerank | Cohere, Jina | [Documentation](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank) |
-| 💬 Claude | Messages format | [Documentation](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message) |
-| 🌐 Gemini | Google Gemini format | [Documentation](https://doc.newapi.pro/en/api/google-gemini-chat) |
+| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [Documentation](https://docs.newapi.pro/api/midjourney-proxy-image) |
+| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [Documentation](https://docs.newapi.pro/api/suno-music) |
+| 🔄 Rerank | Cohere, Jina | [Documentation](https://docs.newapi.pro/api/jinaai-rerank) |
+| 💬 Claude | Messages format | [Documentation](https://docs.newapi.pro/api/anthropic-chat) |
+| 🌐 Gemini | Google Gemini format | [Documentation](https://docs.newapi.pro/api/google-gemini-chat/) |
 | 🔧 Dify | ChatFlow mode | - |
 | 🎯 Custom | Supports complete call address | - |

@@ -264,16 +263,16 @@ docker run --name new-api -d --restart always \
 <details>
 <summary>View complete interface list</summary>

- [Chat Interface (Chat Completions)](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-chat-completion)
- [Response Interface (Responses)](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-response)
- [Image Interface (Image)](https://docs.newapi.pro/en/docs/api/ai-model/images/openai/v1-images-generations--post)
- [Audio Interface (Audio)](https://docs.newapi.pro/en/docs/api/ai-model/audio/openai/create-transcription)
- [Video Interface (Video)](https://docs.newapi.pro/en/docs/api/ai-model/videos/create-video-generation)
- [Embedding Interface (Embeddings)](https://docs.newapi.pro/en/docs/api/ai-model/embeddings/create-embedding)
- [Rerank Interface (Rerank)](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank)
- [Realtime Conversation (Realtime)](https://docs.newapi.pro/en/docs/api/ai-model/realtime/create-realtime-session)
- [Claude Chat](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message)
- [Google Gemini Chat](https://doc.newapi.pro/en/api/google-gemini-chat)
+- [Chat Interface (Chat Completions)](https://docs.newapi.pro/api/openai-chat)
+- [Response Interface (Responses)](https://docs.newapi.pro/api/openai-responses)
+- [Image Interface (Image)](https://docs.newapi.pro/api/openai-image)
+- [Audio Interface (Audio)](https://docs.newapi.pro/api/openai-audio)
+- [Video Interface (Video)](https://docs.newapi.pro/api/openai-video)
+- [Embedding Interface (Embeddings)](https://docs.newapi.pro/api/openai-embeddings)
+- [Rerank Interface (Rerank)](https://docs.newapi.pro/api/jinaai-rerank)
+- [Realtime Conversation (Realtime)](https://docs.newapi.pro/api/openai-realtime)
+- [Claude Chat](https://docs.newapi.pro/api/anthropic-chat)
+- [Google Gemini Chat](https://docs.newapi.pro/api/google-gemini-chat/)

 </details>

@@ -304,19 +303,10 @@ docker run --name new-api -d --restart always \
 | `SQL_DSN` | Database connection string | - |
 | `REDIS_CONN_STRING` | Redis connection string | - |
 | `STREAMING_TIMEOUT` | Streaming timeout (seconds) | `300` |
-| `STREAM_SCANNER_MAX_BUFFER_MB` | Max per-line buffer (MB) for the stream scanner; increase when upstream sends huge image/base64 payloads | `64` |
-| `MAX_REQUEST_BODY_MB` | Max request body size (MB, counted **after decompression**; prevents huge requests/zip bombs from exhausting memory). Exceeding it returns `413` | `32` |
 | `AZURE_DEFAULT_API_VERSION` | Azure API version | `2025-04-01-preview` |
 | `ERROR_LOG_ENABLED` | Error log switch | `false` |
-| `PYROSCOPE_URL` | Pyroscope server address | - |
-| `PYROSCOPE_APP_NAME` | Pyroscope application name | `new-api` |
-| `PYROSCOPE_BASIC_AUTH_USER` | Pyroscope basic auth user | - |
-| `PYROSCOPE_BASIC_AUTH_PASSWORD` | Pyroscope basic auth password | - |
-| `PYROSCOPE_MUTEX_RATE` | Pyroscope mutex sampling rate | `5` |
-| `PYROSCOPE_BLOCK_RATE` | Pyroscope block sampling rate | `5` |
-| `HOSTNAME` | Hostname tag for Pyroscope | `new-api` |

-📖 **Complete configuration:** [Environment Variables Documentation](https://docs.newapi.pro/en/docs/installation/config-maintenance/environment-variables)
+📖 **Complete configuration:** [Environment Variables Documentation](https://docs.newapi.pro/installation/environment-variables)

 </details>

@@ -418,10 +408,10 @@ docker run --name new-api -d --restart always \

 | Resource | Link |
 |------|------|
-| 📘 FAQ | [FAQ](https://docs.newapi.pro/en/docs/support/faq) |
-| 💬 Community Interaction | [Communication Channels](https://docs.newapi.pro/en/docs/support/community-interaction) |
-| 🐛 Issue Feedback | [Issue Feedback](https://docs.newapi.pro/en/docs/support/feedback-issues) |
-| 📚 Complete Documentation | [Official Documentation](https://docs.newapi.pro/en/docs) |
+| 📘 FAQ | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 Community Interaction | [Communication Channels](https://docs.newapi.pro/support/community-interaction) |
+| 🐛 Issue Feedback | [Issue Feedback](https://docs.newapi.pro/support/feedback-issues) |
+| 📚 Complete Documentation | [Official Documentation](https://docs.newapi.pro/support) |

 ### 🤝 Contribution Guide

@@ -450,7 +440,7 @@ Welcome all forms of contribution!

 If this project is helpful to you, welcome to give us a ⭐️ Star！

-**[Official Documentation](https://docs.newapi.pro/en/docs)** • **[Issue Feedback](https://github.com/Calcium-Ion/new-api/issues)** • **[Latest Release](https://github.com/Calcium-Ion/new-api/releases)**
+**[Official Documentation](https://docs.newapi.pro/)** • **[Issue Feedback](https://github.com/Calcium-Ion/new-api/issues)** • **[Latest Release](https://github.com/Calcium-Ion/new-api/releases)**

 <sub>Built with ❤️ by QuantumNous</sub>

--- a/README.fr.md
+++ b/README.fr.md
@@ -146,7 +146,7 @@ docker run --name new-api -d --restart always \

 🎉 Après le déploiement, visitez `http://localhost:3000` pour commencer à utiliser!

-📖 Pour plus de méthodes de déploiement, veuillez vous référer à [Guide de déploiement](https://docs.newapi.pro/en/docs/installation)
+📖 Pour plus de méthodes de déploiement, veuillez vous référer à [Guide de déploiement](https://docs.newapi.pro/installation)

 ---

@@ -154,7 +154,7 @@ docker run --name new-api -d --restart always \

 <div align="center">

-### 📖 [Documentation officielle](https://docs.newapi.pro/en/docs) | [![Demander à DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)
+### 📖 [Documentation officielle](https://docs.newapi.pro/) | [![Demander à DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)

 </div>

@@ -162,17 +162,17 @@ docker run --name new-api -d --restart always \

 | Catégorie | Lien |
 |------|------|
-| 🚀 Guide de déploiement | [Documentation d'installation](https://docs.newapi.pro/en/docs/installation) |
-| ⚙️ Configuration de l'environnement | [Variables d'environnement](https://docs.newapi.pro/en/docs/installation/config-maintenance/environment-variables) |
-| 📡 Documentation de l'API | [Documentation de l'API](https://docs.newapi.pro/en/docs/api) |
-| ❓ FAQ | [FAQ](https://docs.newapi.pro/en/docs/support/faq) |
-| 💬 Interaction avec la communauté | [Canaux de communication](https://docs.newapi.pro/en/docs/support/community-interaction) |
+| 🚀 Guide de déploiement | [Documentation d'installation](https://docs.newapi.pro/installation) |
+| ⚙️ Configuration de l'environnement | [Variables d'environnement](https://docs.newapi.pro/installation/environment-variables) |
+| 📡 Documentation de l'API | [Documentation de l'API](https://docs.newapi.pro/api) |
+| ❓ FAQ | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 Interaction avec la communauté | [Canaux de communication](https://docs.newapi.pro/support/community-interaction) |

 ---

 ## ✨ Fonctionnalités clés

-> Pour les fonctionnalités détaillées, veuillez vous référer à [Présentation des fonctionnalités](https://docs.newapi.pro/en/docs/guide/wiki/basic-concepts/features-introduction) |
+> Pour les fonctionnalités détaillées, veuillez vous référer à [Présentation des fonctionnalités](https://docs.newapi.pro/wiki/features-introduction) |

 ### 🎨 Fonctions principales

@@ -200,11 +200,11 @@ docker run --name new-api -d --restart always \
 ### 🚀 Fonctionnalités avancées

 **Prise en charge des formats d'API:**
- ⚡ [OpenAI Responses](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-response)
- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/en/docs/api/ai-model/realtime/create-realtime-session) (y compris Azure)
- ⚡ [Claude Messages](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message)
- ⚡ [Google Gemini](https://doc.newapi.pro/en/api/google-gemini-chat)
- 🔄 [Modèles Rerank](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank) (Cohere, Jina)
+- ⚡ [OpenAI Responses](https://docs.newapi.pro/api/openai-responses)
+- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/api/openai-realtime) (y compris Azure)
+- ⚡ [Claude Messages](https://docs.newapi.pro/api/anthropic-chat)
+- ⚡ [Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)
+- 🔄 [Modèles Rerank](https://docs.newapi.pro/api/jinaai-rerank) (Cohere, Jina)

 **Routage intelligent:**
 - ⚖️ Sélection aléatoire pondérée des canaux
@@ -234,7 +234,6 @@ docker run --name new-api -d --restart always \
 - `gemini-2.5-flash-nothinking` - Désactiver le mode de pensée
 - `gemini-2.5-pro-thinking` - Activer le mode de pensée
 - `gemini-2.5-pro-thinking-128` - Activer le mode de pensée avec budget de pensée de 128 tokens
- Vous pouvez également ajouter les suffixes `-low`, `-medium` ou `-high` aux modèles Gemini pour fixer le niveau d’effort de raisonnement (sans suffixe de budget supplémentaire).

 </details>

@@ -242,16 +241,16 @@ docker run --name new-api -d --restart always \

 ## 🤖 Prise en charge des modèles

-> Pour les détails, veuillez vous référer à [Documentation de l'API - Interface de relais](https://docs.newapi.pro/en/docs/api)
+> Pour les détails, veuillez vous référer à [Documentation de l'API - Interface de relais](https://docs.newapi.pro/api)

 | Type de modèle | Description | Documentation |
 |---------|------|------|
 | 🤖 OpenAI GPTs | série gpt-4-gizmo-* | - |
-| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [Documentation](https://doc.newapi.pro/en/api/midjourney-proxy-image) |
-| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [Documentation](https://doc.newapi.pro/en/api/suno-music) |
-| 🔄 Rerank | Cohere, Jina | [Documentation](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank) |
-| 💬 Claude | Format Messages | [Documentation](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message) |
-| 🌐 Gemini | Format Google Gemini | [Documentation](https://doc.newapi.pro/en/api/google-gemini-chat) |
+| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [Documentation](https://docs.newapi.pro/api/midjourney-proxy-image) |
+| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [Documentation](https://docs.newapi.pro/api/suno-music) |
+| 🔄 Rerank | Cohere, Jina | [Documentation](https://docs.newapi.pro/api/jinaai-rerank) |
+| 💬 Claude | Format Messages | [Documentation](https://docs.newapi.pro/api/anthropic-chat) |
+| 🌐 Gemini | Format Google Gemini | [Documentation](https://docs.newapi.pro/api/google-gemini-chat/) |
 | 🔧 Dify | Mode ChatFlow | - |
 | 🎯 Personnalisé | Prise en charge de l'adresse d'appel complète | - |

@@ -260,16 +259,16 @@ docker run --name new-api -d --restart always \
 <details>
 <summary>Voir la liste complète des interfaces</summary>

- [Interface de discussion (Chat Completions)](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-chat-completion)
- [Interface de réponse (Responses)](https://docs.newapi.pro/en/docs/api/ai-model/chat/openai/create-response)
- [Interface d'image (Image)](https://docs.newapi.pro/en/docs/api/ai-model/images/openai/v1-images-generations--post)
- [Interface audio (Audio)](https://docs.newapi.pro/en/docs/api/ai-model/audio/openai/create-transcription)
- [Interface vidéo (Video)](https://docs.newapi.pro/en/docs/api/ai-model/videos/create-video-generation)
- [Interface d'incorporation (Embeddings)](https://docs.newapi.pro/en/docs/api/ai-model/embeddings/create-embedding)
- [Interface de rerank (Rerank)](https://docs.newapi.pro/en/docs/api/ai-model/rerank/create-rerank)
- [Conversation en temps réel (Realtime)](https://docs.newapi.pro/en/docs/api/ai-model/realtime/create-realtime-session)
- [Discussion Claude](https://docs.newapi.pro/en/docs/api/ai-model/chat/create-message)
- [Discussion Google Gemini](https://doc.newapi.pro/en/api/google-gemini-chat)
+- [Interface de discussion (Chat Completions)](https://docs.newapi.pro/api/openai-chat)
+- [Interface de réponse (Responses)](https://docs.newapi.pro/api/openai-responses)
+- [Interface d'image (Image)](https://docs.newapi.pro/api/openai-image)
+- [Interface audio (Audio)](https://docs.newapi.pro/api/openai-audio)
+- [Interface vidéo (Video)](https://docs.newapi.pro/api/openai-video)
+- [Interface d'incorporation (Embeddings)](https://docs.newapi.pro/api/openai-embeddings)
+- [Interface de rerank (Rerank)](https://docs.newapi.pro/api/jinaai-rerank)
+- [Conversation en temps réel (Realtime)](https://docs.newapi.pro/api/openai-realtime)
+- [Discussion Claude](https://docs.newapi.pro/api/anthropic-chat)
+- [Discussion Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)

 </details>

@@ -300,19 +299,10 @@ docker run --name new-api -d --restart always \
 | `SQL_DSN` | Chaine de connexion à la base de données | - |
 | `REDIS_CONN_STRING` | Chaine de connexion Redis | - |
 | `STREAMING_TIMEOUT` | Délai d'expiration du streaming (secondes) | `300` |
-| `STREAM_SCANNER_MAX_BUFFER_MB` | Taille max du buffer par ligne (Mo) pour le scanner SSE ; à augmenter quand les sorties image/base64 sont très volumineuses (ex. images 4K) | `64` |
-| `MAX_REQUEST_BODY_MB` | Taille maximale du corps de requête (Mo, comptée **après décompression** ; évite les requêtes énormes/zip bombs qui saturent la mémoire). Dépassement ⇒ `413` | `32` |
 | `AZURE_DEFAULT_API_VERSION` | Version de l'API Azure | `2025-04-01-preview` |
 | `ERROR_LOG_ENABLED` | Interrupteur du journal d'erreurs | `false` |
-| `PYROSCOPE_URL` | Adresse du serveur Pyroscope | - |
-| `PYROSCOPE_APP_NAME` | Nom de l'application Pyroscope | `new-api` |
-| `PYROSCOPE_BASIC_AUTH_USER` | Utilisateur Basic Auth Pyroscope | - |
-| `PYROSCOPE_BASIC_AUTH_PASSWORD` | Mot de passe Basic Auth Pyroscope | - |
-| `PYROSCOPE_MUTEX_RATE` | Taux d'échantillonnage mutex Pyroscope | `5` |
-| `PYROSCOPE_BLOCK_RATE` | Taux d'échantillonnage block Pyroscope | `5` |
-| `HOSTNAME` | Nom d'hôte tagué pour Pyroscope | `new-api` |

-📖 **Configuration complète:** [Documentation des variables d'environnement](https://docs.newapi.pro/en/docs/installation/config-maintenance/environment-variables)
+📖 **Configuration complète:** [Documentation des variables d'environnement](https://docs.newapi.pro/installation/environment-variables)

 </details>

@@ -412,10 +402,10 @@ docker run --name new-api -d --restart always \

 | Ressource | Lien |
 |------|------|
-| 📘 FAQ | [FAQ](https://docs.newapi.pro/en/docs/support/faq) |
-| 💬 Interaction avec la communauté | [Canaux de communication](https://docs.newapi.pro/en/docs/support/community-interaction) |
-| 🐛 Commentaires sur les problèmes | [Commentaires sur les problèmes](https://docs.newapi.pro/en/docs/support/feedback-issues) |
-| 📚 Documentation complète | [Documentation officielle](https://docs.newapi.pro/en/docs) |
+| 📘 FAQ | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 Interaction avec la communauté | [Canaux de communication](https://docs.newapi.pro/support/community-interaction) |
+| 🐛 Commentaires sur les problèmes | [Commentaires sur les problèmes](https://docs.newapi.pro/support/feedback-issues) |
+| 📚 Documentation complète | [Documentation officielle](https://docs.newapi.pro/support) |

 ### 🤝 Guide de contribution

@@ -444,8 +434,8 @@ Bienvenue à toutes les formes de contribution!

 Si ce projet vous est utile, bienvenue à nous donner une ⭐️ Étoile！

-**[Documentation officielle](https://docs.newapi.pro/en/docs)** • **[Commentaires sur les problèmes](https://github.com/Calcium-Ion/new-api/issues)** • **[Dernière version](https://github.com/Calcium-Ion/new-api/releases)**
+**[Documentation officielle](https://docs.newapi.pro/)** • **[Commentaires sur les problèmes](https://github.com/Calcium-Ion/new-api/issues)** • **[Dernière version](https://github.com/Calcium-Ion/new-api/releases)**

 <sub>Construit avec ❤️ par QuantumNous</sub>

-</div>
+</div>
--- a/README.ja.md
+++ b/README.ja.md
@@ -146,7 +146,7 @@ docker run --name new-api -d --restart always \

 🎉 デプロイが完了したら、`http://localhost:3000` にアクセスして使用を開始してください！

-📖 その他のデプロイ方法については[デプロイガイド](https://docs.newapi.pro/ja/docs/installation)を参照してください。
+📖 その他のデプロイ方法については[デプロイガイド](https://docs.newapi.pro/installation)を参照してください。

 ---

@@ -154,7 +154,7 @@ docker run --name new-api -d --restart always \

 <div align="center">

-### 📖 [公式ドキュメント](https://docs.newapi.pro/ja/docs) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)
+### 📖 [公式ドキュメント](https://docs.newapi.pro/) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)

 </div>

@@ -162,17 +162,17 @@ docker run --name new-api -d --restart always \

 | カテゴリ | リンク |
 |------|------|
-| 🚀 デプロイガイド | [インストールドキュメント](https://docs.newapi.pro/ja/docs/installation) |
-| ⚙️ 環境設定 | [環境変数](https://docs.newapi.pro/ja/docs/installation/config-maintenance/environment-variables) |
-| 📡 APIドキュメント | [APIドキュメント](https://docs.newapi.pro/ja/docs/api) |
-| ❓ よくある質問 | [FAQ](https://docs.newapi.pro/ja/docs/support/faq) |
-| 💬 コミュニティ交流 | [交流チャネル](https://docs.newapi.pro/ja/docs/support/community-interaction) |
+| 🚀 デプロイガイド | [インストールドキュメント](https://docs.newapi.pro/installation) |
+| ⚙️ 環境設定 | [環境変数](https://docs.newapi.pro/installation/environment-variables) |
+| 📡 APIドキュメント | [APIドキュメント](https://docs.newapi.pro/api) |
+| ❓ よくある質問 | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 コミュニティ交流 | [交流チャネル](https://docs.newapi.pro/support/community-interaction) |

 ---

 ## ✨ 主な機能

-> 詳細な機能については[機能説明](https://docs.newapi.pro/ja/docs/guide/wiki/basic-concepts/features-introduction)を参照してください。
+> 詳細な機能については[機能説明](https://docs.newapi.pro/wiki/features-introduction)を参照してください。

 ### 🎨 コア機能

@@ -202,15 +202,15 @@ docker run --name new-api -d --restart always \
 ### 🚀 高度な機能

 **APIフォーマットサポート:**
- ⚡ [OpenAI Responses](https://docs.newapi.pro/ja/docs/api/ai-model/chat/openai/create-response)
- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/ja/docs/api/ai-model/realtime/create-realtime-session)（Azureを含む）
- ⚡ [Claude Messages](https://docs.newapi.pro/ja/docs/api/ai-model/chat/create-message)
- ⚡ [Google Gemini](https://doc.newapi.pro/ja/api/google-gemini-chat)
- 🔄 [Rerankモデル](https://docs.newapi.pro/ja/docs/api/ai-model/rerank/create-rerank)
- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/ja/docs/api/ai-model/realtime/create-realtime-session)
- ⚡ [Claude Messages](https://docs.newapi.pro/ja/docs/api/ai-model/chat/create-message)
- ⚡ [Google Gemini](https://doc.newapi.pro/ja/api/google-gemini-chat)
- 🔄 [Rerankモデル](https://docs.newapi.pro/ja/docs/api/ai-model/rerank/create-rerank)（Cohere、Jina）
+- ⚡ [OpenAI Responses](https://docs.newapi.pro/api/openai-responses)
+- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/api/openai-realtime)（Azureを含む）
+- ⚡ [Claude Messages](https://docs.newapi.pro/api/anthropic-chat)
+- ⚡ [Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)
+- 🔄 [Rerankモデル](https://docs.newapi.pro/api/jinaai-rerank)
+- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/api/openai-realtime)
+- ⚡ [Claude Messages](https://docs.newapi.pro/api/anthropic-chat)
+- ⚡ [Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)
+- 🔄 [Rerankモデル](https://docs.newapi.pro/api/jinaai-rerank)（Cohere、Jina）

 **インテリジェントルーティング:**
 - ⚖️ チャネル重み付けランダム
@@ -243,7 +243,6 @@ docker run --name new-api -d --restart always \
 - `gemini-2.5-flash-nothinking` - 思考モードを無効にする
 - `gemini-2.5-pro-thinking` - 思考モードを有効にする
 - `gemini-2.5-pro-thinking-128` - 思考モードを有効にし、思考予算を128トークンに設定する
- Gemini モデル名の末尾に `-low` / `-medium` / `-high` を付けることで推論強度を直接指定できます（追加の思考予算サフィックスは不要です）。

 </details>

@@ -251,16 +250,16 @@ docker run --name new-api -d --restart always \

 ## 🤖 モデルサポート

-> 詳細については[APIドキュメント - 中継インターフェース](https://docs.newapi.pro/ja/docs/api)
+> 詳細については[APIドキュメント - 中継インターフェース](https://docs.newapi.pro/api)

 | モデルタイプ | 説明 | ドキュメント |
 |---------|------|------|
 | 🤖 OpenAI GPTs | gpt-4-gizmo-* シリーズ | - |
-| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [ドキュメント](https://doc.newapi.pro/ja/api/midjourney-proxy-image) |
-| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [ドキュメント](https://doc.newapi.pro/ja/api/suno-music) |
-| 🔄 Rerank | Cohere、Jina | [ドキュメント](https://docs.newapi.pro/ja/docs/api/ai-model/rerank/create-rerank) |
-| 💬 Claude | Messagesフォーマット | [ドキュメント](https://docs.newapi.pro/ja/docs/api/ai-model/chat/create-message) |
-| 🌐 Gemini | Google Geminiフォーマット | [ドキュメント](https://doc.newapi.pro/ja/api/google-gemini-chat) |
+| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [ドキュメント](https://docs.newapi.pro/api/midjourney-proxy-image) |
+| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [ドキュメント](https://docs.newapi.pro/api/suno-music) |
+| 🔄 Rerank | Cohere、Jina | [ドキュメント](https://docs.newapi.pro/api/jinaai-rerank) |
+| 💬 Claude | Messagesフォーマット | [ドキュメント](https://docs.newapi.pro/api/suno-music) |
+| 🌐 Gemini | Google Geminiフォーマット | [ドキュメント](https://docs.newapi.pro/api/google-gemini-chat/) |
 | 🔧 Dify | ChatFlowモード | - |
 | 🎯 カスタム | 完全な呼び出しアドレスの入力をサポート | - |

@@ -269,16 +268,16 @@ docker run --name new-api -d --restart always \
 <details>
 <summary>完全なインターフェースリストを表示</summary>

- [チャットインターフェース (Chat Completions)](https://docs.newapi.pro/ja/docs/api/ai-model/chat/openai/create-chat-completion)
- [レスポンスインターフェース (Responses)](https://docs.newapi.pro/ja/docs/api/ai-model/chat/openai/create-response)
- [イメージインターフェース (Image)](https://docs.newapi.pro/ja/docs/api/ai-model/images/openai/v1-images-generations--post)
- [オーディオインターフェース (Audio)](https://docs.newapi.pro/ja/docs/api/ai-model/audio/openai/create-transcription)
- [ビデオインターフェース (Video)](https://docs.newapi.pro/ja/docs/api/ai-model/videos/create-video-generation)
- [エンベッドインターフェース (Embeddings)](https://docs.newapi.pro/ja/docs/api/ai-model/embeddings/create-embedding)
- [再ランク付けインターフェース (Rerank)](https://docs.newapi.pro/ja/docs/api/ai-model/rerank/create-rerank)
- [リアルタイム対話インターフェース (Realtime)](https://docs.newapi.pro/ja/docs/api/ai-model/realtime/create-realtime-session)
- [Claudeチャット](https://docs.newapi.pro/ja/docs/api/ai-model/chat/create-message)
- [Google Geminiチャット](https://doc.newapi.pro/ja/api/google-gemini-chat)
+- [チャットインターフェース (Chat Completions)](https://docs.newapi.pro/api/openai-chat)
+- [レスポンスインターフェース (Responses)](https://docs.newapi.pro/api/openai-responses)
+- [イメージインターフェース (Image)](https://docs.newapi.pro/api/openai-image)
+- [オーディオインターフェース (Audio)](https://docs.newapi.pro/api/openai-audio)
+- [ビデオインターフェース (Video)](https://docs.newapi.pro/api/openai-video)
+- [エンベッドインターフェース (Embeddings)](https://docs.newapi.pro/api/openai-embeddings)
+- [再ランク付けインターフェース (Rerank)](https://docs.newapi.pro/api/jinaai-rerank)
+- [リアルタイム対話インターフェース (Realtime)](https://docs.newapi.pro/api/openai-realtime)
+- [Claudeチャット](https://docs.newapi.pro/api/anthropic-chat)
+- [Google Geminiチャット](https://docs.newapi.pro/api/google-gemini-chat/)

 </details>

@@ -309,19 +308,10 @@ docker run --name new-api -d --restart always \
 | `SQL_DSN** | データベース接続文字列 | - |
 | `REDIS_CONN_STRING` | Redis接続文字列 | - |
 | `STREAMING_TIMEOUT` | ストリーミング応答のタイムアウト時間（秒） | `300` |
-| `STREAM_SCANNER_MAX_BUFFER_MB` | ストリームスキャナの1行あたりバッファ上限（MB）。4K画像など巨大なbase64 `data:` ペイロードを扱う場合は値を増加させてください | `64` |
-| `MAX_REQUEST_BODY_MB` | リクエストボディ最大サイズ（MB、**解凍後**に計測。巨大リクエスト/zip bomb によるメモリ枯渇を防止）。超過時は `413` | `32` |
 | `AZURE_DEFAULT_API_VERSION` | Azure APIバージョン | `2025-04-01-preview` |
 | `ERROR_LOG_ENABLED` | エラーログスイッチ | `false` |
-| `PYROSCOPE_URL` | Pyroscopeサーバーのアドレス | - |
-| `PYROSCOPE_APP_NAME` | Pyroscopeアプリ名 | `new-api` |
-| `PYROSCOPE_BASIC_AUTH_USER` | Pyroscope Basic Authユーザー | - |
-| `PYROSCOPE_BASIC_AUTH_PASSWORD` | Pyroscope Basic Authパスワード | - |
-| `PYROSCOPE_MUTEX_RATE` | Pyroscope mutexサンプリング率 | `5` |
-| `PYROSCOPE_BLOCK_RATE` | Pyroscope blockサンプリング率 | `5` |
-| `HOSTNAME` | Pyroscope用のホスト名タグ | `new-api` |

-📖 **完全な設定:** [環境変数ドキュメント](https://docs.newapi.pro/ja/docs/installation/config-maintenance/environment-variables)
+📖 **完全な設定:** [環境変数ドキュメント](https://docs.newapi.pro/installation/environment-variables)

 </details>

@@ -421,10 +411,10 @@ docker run --name new-api -d --restart always \

 | リソース | リンク |
 |------|------|
-| 📘 よくある質問 | [FAQ](https://docs.newapi.pro/ja/docs/support/faq) |
-| 💬 コミュニティ交流 | [交流チャネル](https://docs.newapi.pro/ja/docs/support/community-interaction) |
-| 🐛 問題のフィードバック | [問題フィードバック](https://docs.newapi.pro/ja/docs/support/feedback-issues) |
-| 📚 完全なドキュメント | [公式ドキュメント](https://docs.newapi.pro/ja/docs) |
+| 📘 よくある質問 | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 コミュニティ交流 | [交流チャネル](https://docs.newapi.pro/support/community-interaction) |
+| 🐛 問題のフィードバック | [問題フィードバック](https://docs.newapi.pro/support/feedback-issues) |
+| 📚 完全なドキュメント | [公式ドキュメント](https://docs.newapi.pro/support) |

 ### 🤝 貢献ガイド

@@ -453,7 +443,7 @@ docker run --name new-api -d --restart always \

 このプロジェクトがあなたのお役に立てたなら、ぜひ ⭐️ スターをください！

-**[公式ドキュメント](https://docs.newapi.pro/ja/docs)** • **[問題フィードバック](https://github.com/Calcium-Ion/new-api/issues)** • **[最新リリース](https://github.com/Calcium-Ion/new-api/releases)**
+**[公式ドキュメント](https://docs.newapi.pro/)** • **[問題フィードバック](https://github.com/Calcium-Ion/new-api/issues)** • **[最新リリース](https://github.com/Calcium-Ion/new-api/releases)**

 <sub>❤️ で構築された QuantumNous</sub>

--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ docker run --name new-api -d --restart always \

 🎉 部署完成后，访问 `http://localhost:3000` 即可使用！

-📖 更多部署方式请参考 [部署指南](https://docs.newapi.pro/zh/docs/installation)
+📖 更多部署方式请参考 [部署指南](https://docs.newapi.pro/installation)

 ---

@@ -154,7 +154,7 @@ docker run --name new-api -d --restart always \

 <div align="center">

-### 📖 [官方文档](https://docs.newapi.pro/zh/docs) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)
+### 📖 [官方文档](https://docs.newapi.pro/) | [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/QuantumNous/new-api)

 </div>

@@ -162,17 +162,17 @@ docker run --name new-api -d --restart always \

 | 分类 | 链接 |
 |------|------|
-| 🚀 部署指南 | [安装文档](https://docs.newapi.pro/zh/docs/installation) |
-| ⚙️ 环境配置 | [环境变量](https://docs.newapi.pro/zh/docs/installation/config-maintenance/environment-variables) |
-| 📡 接口文档 | [API 文档](https://docs.newapi.pro/zh/docs/api) |
-| ❓ 常见问题 | [FAQ](https://docs.newapi.pro/zh/docs/support/faq) |
-| 💬 社区交流 | [交流渠道](https://docs.newapi.pro/zh/docs/support/community-interaction) |
+| 🚀 部署指南 | [安装文档](https://docs.newapi.pro/installation) |
+| ⚙️ 环境配置 | [环境变量](https://docs.newapi.pro/installation/environment-variables) |
+| 📡 接口文档 | [API 文档](https://docs.newapi.pro/api) |
+| ❓ 常见问题 | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 社区交流 | [交流渠道](https://docs.newapi.pro/support/community-interaction) |

 ---

 ## ✨ 主要特性

-> 详细特性请参考 [特性说明](https://docs.newapi.pro/zh/docs/guide/wiki/basic-concepts/features-introduction)
+> 详细特性请参考 [特性说明](https://docs.newapi.pro/wiki/features-introduction)

 ### 🎨 核心功能

@@ -202,11 +202,11 @@ docker run --name new-api -d --restart always \
 ### 🚀 高级功能

 **API 格式支持：**
- ⚡ [OpenAI Responses](https://docs.newapi.pro/zh/docs/api/ai-model/chat/openai/create-response)
- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/zh/docs/api/ai-model/realtime/create-realtime-session)（含 Azure）
- ⚡ [Claude Messages](https://docs.newapi.pro/zh/docs/api/ai-model/chat/create-message)
- ⚡ [Google Gemini](https://doc.newapi.pro/api/google-gemini-chat)
- 🔄 [Rerank 模型](https://docs.newapi.pro/zh/docs/api/ai-model/rerank/create-rerank)（Cohere、Jina）
+- ⚡ [OpenAI Responses](https://docs.newapi.pro/api/openai-responses)
+- ⚡ [OpenAI Realtime API](https://docs.newapi.pro/api/openai-realtime)（含 Azure）
+- ⚡ [Claude Messages](https://docs.newapi.pro/api/anthropic-chat)
+- ⚡ [Google Gemini](https://docs.newapi.pro/api/google-gemini-chat/)
+- 🔄 [Rerank 模型](https://docs.newapi.pro/api/jinaai-rerank)（Cohere、Jina）

 **智能路由：**
 - ⚖️ 渠道加权随机
@@ -239,7 +239,6 @@ docker run --name new-api -d --restart always \
 - `gemini-2.5-flash-nothinking` - 禁用思考模式
 - `gemini-2.5-pro-thinking` - 启用思考模式
 - `gemini-2.5-pro-thinking-128` - 启用思考模式，并设置思考预算为128tokens
- 也可以直接在 Gemini 模型名称后追加 `-low` / `-medium` / `-high` 来控制思考力度（无需再设置思考预算后缀）

 </details>

@@ -247,16 +246,16 @@ docker run --name new-api -d --restart always \

 ## 🤖 模型支持

-> 详情请参考 [接口文档 - 中继接口](https://docs.newapi.pro/zh/docs/api)
+> 详情请参考 [接口文档 - 中继接口](https://docs.newapi.pro/api)

 | 模型类型 | 说明 | 文档 |
 |---------|------|------|
 | 🤖 OpenAI GPTs | gpt-4-gizmo-* 系列 | - |
-| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [文档](https://doc.newapi.pro/api/midjourney-proxy-image) |
-| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [文档](https://doc.newapi.pro/api/suno-music) |
-| 🔄 Rerank | Cohere、Jina | [文档](https://docs.newapi.pro/zh/docs/api/ai-model/rerank/create-rerank) |
-| 💬 Claude | Messages 格式 | [文档](https://docs.newapi.pro/zh/docs/api/ai-model/chat/create-message) |
-| 🌐 Gemini | Google Gemini 格式 | [文档](https://doc.newapi.pro/api/google-gemini-chat) |
+| 🎨 Midjourney-Proxy | [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy) | [文档](https://docs.newapi.pro/api/midjourney-proxy-image) |
+| 🎵 Suno-API | [Suno API](https://github.com/Suno-API/Suno-API) | [文档](https://docs.newapi.pro/api/suno-music) |
+| 🔄 Rerank | Cohere、Jina | [文档](https://docs.newapi.pro/api/jinaai-rerank) |
+| 💬 Claude | Messages 格式 | [文档](https://docs.newapi.pro/api/anthropic-chat) |
+| 🌐 Gemini | Google Gemini 格式 | [文档](https://docs.newapi.pro/api/google-gemini-chat/) |
 | 🔧 Dify | ChatFlow 模式 | - |
 | 🎯 自定义 | 支持完整调用地址 | - |

@@ -265,16 +264,16 @@ docker run --name new-api -d --restart always \
 <details>
 <summary>查看完整接口列表</summary>

- [聊天接口 (Chat Completions)](https://docs.newapi.pro/zh/docs/api/ai-model/chat/openai/create-chat-completion)
- [响应接口 (Responses)](https://docs.newapi.pro/zh/docs/api/ai-model/chat/openai/create-response)
- [图像接口 (Image)](https://docs.newapi.pro/zh/docs/api/ai-model/images/openai/v1-images-generations--post)
- [音频接口 (Audio)](https://docs.newapi.pro/zh/docs/api/ai-model/audio/openai/create-transcription)
- [视频接口 (Video)](https://docs.newapi.pro/zh/docs/api/ai-model/videos/create-video-generation)
- [嵌入接口 (Embeddings)](https://docs.newapi.pro/zh/docs/api/ai-model/embeddings/create-embedding)
- [重排序接口 (Rerank)](https://docs.newapi.pro/zh/docs/api/ai-model/rerank/create-rerank)
- [实时对话 (Realtime)](https://docs.newapi.pro/zh/docs/api/ai-model/realtime/create-realtime-session)
- [Claude 聊天](https://docs.newapi.pro/zh/docs/api/ai-model/chat/create-message)
- [Google Gemini 聊天](https://doc.newapi.pro/api/google-gemini-chat)
+- [聊天接口 (Chat Completions)](https://docs.newapi.pro/api/openai-chat)
+- [响应接口 (Responses)](https://docs.newapi.pro/api/openai-responses)
+- [图像接口 (Image)](https://docs.newapi.pro/api/openai-image)
+- [音频接口 (Audio)](https://docs.newapi.pro/api/openai-audio)
+- [视频接口 (Video)](https://docs.newapi.pro/api/openai-video)
+- [嵌入接口 (Embeddings)](https://docs.newapi.pro/api/openai-embeddings)
+- [重排序接口 (Rerank)](https://docs.newapi.pro/api/jinaai-rerank)
+- [实时对话 (Realtime)](https://docs.newapi.pro/api/openai-realtime)
+- [Claude 聊天](https://docs.newapi.pro/api/anthropic-chat)
+- [Google Gemini 聊天](https://docs.newapi.pro/api/google-gemini-chat)

 </details>

@@ -298,26 +297,17 @@ docker run --name new-api -d --restart always \
 <details>
 <summary>常用环境变量配置</summary>

-| 变量名 | 说明                                                           | 默认值 |
-|--------|--------------------------------------------------------------|--------|
-| `SESSION_SECRET` | 会话密钥（多机部署必须）                                                 | - |
-| `CRYPTO_SECRET` | 加密密钥（Redis 必须）                                               | - |
-| `SQL_DSN` | 数据库连接字符串                                                     | - |
-| `REDIS_CONN_STRING` | Redis 连接字符串                                                  | - |
-| `STREAMING_TIMEOUT` | 流式超时时间（秒）                                                    | `300` |
-| `STREAM_SCANNER_MAX_BUFFER_MB` | 流式扫描器单行最大缓冲（MB），图像生成等超大 `data:` 片段（如 4K 图片 base64）需适当调大 | `64` |
-| `MAX_REQUEST_BODY_MB` | 请求体最大大小（MB，**解压后**计；防止超大请求/zip bomb 导致内存暴涨），超过将返回 `413` | `32` |
-| `AZURE_DEFAULT_API_VERSION` | Azure API 版本                                                 | `2025-04-01-preview` |
-| `ERROR_LOG_ENABLED` | 错误日志开关                                                       | `false` |
-| `PYROSCOPE_URL` | Pyroscope 服务地址                                            | - |
-| `PYROSCOPE_APP_NAME` | Pyroscope 应用名                                        | `new-api` |
-| `PYROSCOPE_BASIC_AUTH_USER` | Pyroscope Basic Auth 用户名                        | - |
-| `PYROSCOPE_BASIC_AUTH_PASSWORD` | Pyroscope Basic Auth 密码                  | - |
-| `PYROSCOPE_MUTEX_RATE` | Pyroscope mutex 采样率                               | `5` |
-| `PYROSCOPE_BLOCK_RATE` | Pyroscope block 采样率                               | `5` |
-| `HOSTNAME` | Pyroscope 标签里的主机名                                          | `new-api` |
+| 变量名 | 说明 | 默认值 |
+|--------|------|--------|
+| `SESSION_SECRET` | 会话密钥（多机部署必须） | - |
+| `CRYPTO_SECRET` | 加密密钥（Redis 必须） | - |
+| `SQL_DSN` | 数据库连接字符串 | - |
+| `REDIS_CONN_STRING` | Redis 连接字符串 | - |
+| `STREAMING_TIMEOUT` | 流式超时时间（秒） | `300` |
+| `AZURE_DEFAULT_API_VERSION` | Azure API 版本 | `2025-04-01-preview` |
+| `ERROR_LOG_ENABLED` | 错误日志开关 | `false` |

-📖 **完整配置：** [环境变量文档](https://docs.newapi.pro/zh/docs/installation/config-maintenance/environment-variables)
+📖 **完整配置：** [环境变量文档](https://docs.newapi.pro/installation/environment-variables)

 </details>

@@ -419,10 +409,10 @@ docker run --name new-api -d --restart always \

 | 资源 | 链接 |
 |------|------|
-| 📘 常见问题 | [FAQ](https://docs.newapi.pro/zh/docs/support/faq) |
-| 💬 社区交流 | [交流渠道](https://docs.newapi.pro/zh/docs/support/community-interaction) |
-| 🐛 反馈问题 | [问题反馈](https://docs.newapi.pro/zh/docs/support/feedback-issues) |
-| 📚 完整文档 | [官方文档](https://docs.newapi.pro/zh/docs) |
+| 📘 常见问题 | [FAQ](https://docs.newapi.pro/support/faq) |
+| 💬 社区交流 | [交流渠道](https://docs.newapi.pro/support/community-interaction) |
+| 🐛 反馈问题 | [问题反馈](https://docs.newapi.pro/support/feedback-issues) |
+| 📚 完整文档 | [官方文档](https://docs.newapi.pro/support) |

 ### 🤝 贡献指南

@@ -451,7 +441,7 @@ docker run --name new-api -d --restart always \

 如果这个项目对你有帮助，欢迎给我们一个 ⭐️ Star！

-**[官方文档](https://docs.newapi.pro/zh/docs)** • **[问题反馈](https://github.com/Calcium-Ion/new-api/issues)** • **[最新发布](https://github.com/Calcium-Ion/new-api/releases)**
+**[官方文档](https://docs.newapi.pro/)** • **[问题反馈](https://github.com/Calcium-Ion/new-api/issues)** • **[最新发布](https://github.com/Calcium-Ion/new-api/releases)**

 <sub>Built with ❤️ by QuantumNous</sub>

--- a/common/audio.go
+++ b/common/audio.go
@@ -71,66 +71,15 @@ func getMP3Duration(r io.Reader) (float64, error) {

 // getWAVDuration 解析 WAV 文件头以获取时长。
 func getWAVDuration(r io.ReadSeeker) (float64, error) {
-	// 1. 强制复位指针
-	r.Seek(0, io.SeekStart)
-
 	dec := wav.NewDecoder(r)
-
-	// IsValidFile 会读取 fmt 块
 	if !dec.IsValidFile() {
 		return 0, errors.New("invalid wav file")
 	}
-
-	// 尝试寻找 data 块
-	if err := dec.FwdToPCM(); err != nil {
-		return 0, errors.Wrap(err, "failed to find PCM data chunk")
+	d, err := dec.Duration()
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get wav duration")
 	}
-
-	pcmSize := int64(dec.PCMSize)
-
-	// 如果读出来的 Size 是 0，尝试用文件大小反推
-	if pcmSize == 0 {
-		// 获取文件总大小
-		currentPos, _ := r.Seek(0, io.SeekCurrent) // 当前通常在 data chunk header 之后
-		endPos, _ := r.Seek(0, io.SeekEnd)
-		fileSize := endPos
-
-		// 恢复位置（虽然如果不继续读也没关系）
-		r.Seek(currentPos, io.SeekStart)
-
-		// 数据区大小 ≈ 文件总大小 - 当前指针位置(即Header大小)
-		// 注意：FwdToPCM 成功后，CurrentPos 应该刚好指向 Data 区数据的开始
-		// 或者是 Data Chunk ID + Size 之后。
-		// WAV Header 一般 44 字节。
-		if fileSize > 44 {
-			// 如果 FwdToPCM 成功，Reader 应该位于 data 块的数据起始处
-			// 所以剩余的所有字节理论上都是音频数据
-			pcmSize = fileSize - currentPos
-
-			// 简单的兜底：如果算出来还是负数或0，强制按文件大小-44计算
-			if pcmSize <= 0 {
-				pcmSize = fileSize - 44
-			}
-		}
-	}
-
-	numChans := int64(dec.NumChans)
-	bitDepth := int64(dec.BitDepth)
-	sampleRate := float64(dec.SampleRate)
-
-	if sampleRate == 0 || numChans == 0 || bitDepth == 0 {
-		return 0, errors.New("invalid wav header metadata")
-	}
-
-	bytesPerFrame := numChans * (bitDepth / 8)
-	if bytesPerFrame == 0 {
-		return 0, errors.New("invalid byte depth calculation")
-	}
-
-	totalFrames := pcmSize / bytesPerFrame
-
-	durationSeconds := float64(totalFrames) / sampleRate
-	return durationSeconds, nil
+	return d.Seconds(), nil
 }

 // getFLACDuration 解析 FLAC 文件的 STREAMINFO 块。
--- a/common/constants.go
+++ b/common/constants.go
@@ -121,9 +121,6 @@ var BatchUpdateInterval int

 var RelayTimeout int // unit is second

-var RelayMaxIdleConns int
-var RelayMaxIdleConnsPerHost int
-
 var GeminiSafetySetting string

 // https://docs.cohere.com/docs/safety-modes Type; NONE/CONTEXTUAL/STRICT
--- a/common/email.go
+++ b/common/email.go
@@ -32,7 +32,7 @@ func SendEmail(subject string, receiver string, content string) error {
 	}
 	encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject)))
 	mail := []byte(fmt.Sprintf("To: %s\r\n"+
-		"From: %s <%s>\r\n"+
+		"From: %s<%s>\r\n"+
 		"Subject: %s\r\n"+
 		"Date: %s\r\n"+
 		"Message-ID: %s\r\n"+ // 添加 Message-ID 头
--- a/common/embed-file-system.go
+++ b/common/embed-file-system.go
@@ -4,7 +4,6 @@ import (
 	"embed"
 	"io/fs"
 	"net/http"
-	"os"

 	"github.com/gin-contrib/static"
 )
@@ -15,7 +14,7 @@ type embedFileSystem struct {
 	http.FileSystem
 }

-func (e *embedFileSystem) Exists(prefix string, path string) bool {
+func (e embedFileSystem) Exists(prefix string, path string) bool {
 	_, err := e.Open(path)
 	if err != nil {
 		return false
@@ -23,21 +22,12 @@ func (e *embedFileSystem) Exists(prefix string, path string) bool {
 	return true
 }

-func (e *embedFileSystem) Open(name string) (http.File, error) {
-	if name == "/" {
-		// This will make sure the index page goes to NoRouter handler,
-		// which will use the replaced index bytes with analytic codes.
-		return nil, os.ErrNotExist
-	}
-	return e.FileSystem.Open(name)
-}
-
 func EmbedFolder(fsEmbed embed.FS, targetPath string) static.ServeFileSystem {
 	efs, err := fs.Sub(fsEmbed, targetPath)
 	if err != nil {
 		panic(err)
 	}
-	return &embedFileSystem{
+	return embedFileSystem{
 		FileSystem: http.FS(efs),
 	}
 }
--- a/common/gin.go
+++ b/common/gin.go
@@ -2,7 +2,7 @@ package common

 import (
 	"bytes"
-	"fmt"
+	"errors"
 	"io"
 	"mime"
 	"mime/multipart"
@@ -12,61 +12,24 @@ import (
 	"time"

 	"github.com/QuantumNous/new-api/constant"
-	"github.com/pkg/errors"

 	"github.com/gin-gonic/gin"
 )

 const KeyRequestBody = "key_request_body"

-var ErrRequestBodyTooLarge = errors.New("request body too large")
-
-func IsRequestBodyTooLargeError(err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, ErrRequestBodyTooLarge) {
-		return true
-	}
-	var mbe *http.MaxBytesError
-	return errors.As(err, &mbe)
-}
-
 func GetRequestBody(c *gin.Context) ([]byte, error) {
-	cached, exists := c.Get(KeyRequestBody)
-	if exists && cached != nil {
-		if b, ok := cached.([]byte); ok {
-			return b, nil
-		}
+	requestBody, _ := c.Get(KeyRequestBody)
+	if requestBody != nil {
+		return requestBody.([]byte), nil
 	}
-	maxMB := constant.MaxRequestBodyMB
-	if maxMB <= 0 {
-		// no limit
-		body, err := io.ReadAll(c.Request.Body)
-		_ = c.Request.Body.Close()
-		if err != nil {
-			return nil, err
-		}
-		c.Set(KeyRequestBody, body)
-		return body, nil
-	}
-	maxBytes := int64(maxMB) << 20
-
-	limited := io.LimitReader(c.Request.Body, maxBytes+1)
-	body, err := io.ReadAll(limited)
+	requestBody, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		_ = c.Request.Body.Close()
-		if IsRequestBodyTooLargeError(err) {
-			return nil, errors.Wrap(ErrRequestBodyTooLarge, fmt.Sprintf("request body exceeds %d MB", maxMB))
-		}
 		return nil, err
 	}
 	_ = c.Request.Body.Close()
-	if int64(len(body)) > maxBytes {
-		return nil, errors.Wrap(ErrRequestBodyTooLarge, fmt.Sprintf("request body exceeds %d MB", maxMB))
-	}
-	c.Set(KeyRequestBody, body)
-	return body, nil
+	c.Set(KeyRequestBody, requestBody)
+	return requestBody.([]byte), nil
 }

 func UnmarshalBodyReusable(c *gin.Context, v any) error {
--- a/common/init.go
+++ b/common/init.go
@@ -90,8 +90,6 @@ func InitEnv() {
 	SyncFrequency = GetEnvOrDefault("SYNC_FREQUENCY", 60)
 	BatchUpdateInterval = GetEnvOrDefault("BATCH_UPDATE_INTERVAL", 5)
 	RelayTimeout = GetEnvOrDefault("RELAY_TIMEOUT", 0)
-	RelayMaxIdleConns = GetEnvOrDefault("RELAY_MAX_IDLE_CONNS", 500)
-	RelayMaxIdleConnsPerHost = GetEnvOrDefault("RELAY_MAX_IDLE_CONNS_PER_HOST", 100)

 	// Initialize string variables with GetEnvOrDefaultString
 	GeminiSafetySetting = GetEnvOrDefaultString("GEMINI_SAFETY_SETTING", "BLOCK_NONE")
@@ -115,10 +113,7 @@ func InitEnv() {
 func initConstantEnv() {
 	constant.StreamingTimeout = GetEnvOrDefault("STREAMING_TIMEOUT", 300)
 	constant.DifyDebug = GetEnvOrDefaultBool("DIFY_DEBUG", true)
-	constant.MaxFileDownloadMB = GetEnvOrDefault("MAX_FILE_DOWNLOAD_MB", 64)
-	constant.StreamScannerMaxBufferMB = GetEnvOrDefault("STREAM_SCANNER_MAX_BUFFER_MB", 64)
-	// MaxRequestBodyMB 请求体最大大小（解压后），用于防止超大请求/zip bomb导致内存暴涨
-	constant.MaxRequestBodyMB = GetEnvOrDefault("MAX_REQUEST_BODY_MB", 64)
+	constant.MaxFileDownloadMB = GetEnvOrDefault("MAX_FILE_DOWNLOAD_MB", 20)
 	// ForceStreamOption 覆盖请求参数，强制返回usage信息
 	constant.ForceStreamOption = GetEnvOrDefaultBool("FORCE_STREAM_OPTION", true)
 	constant.CountToken = GetEnvOrDefaultBool("CountToken", true)
@@ -133,8 +128,6 @@ func initConstantEnv() {
 	constant.GenerateDefaultToken = GetEnvOrDefaultBool("GENERATE_DEFAULT_TOKEN", false)
 	// 是否启用错误日志
 	constant.ErrorLogEnabled = GetEnvOrDefaultBool("ERROR_LOG_ENABLED", false)
-	// 任务轮询时查询的最大数量
-	constant.TaskQueryLimit = GetEnvOrDefault("TASK_QUERY_LIMIT", 1000)

 	soraPatchStr := GetEnvOrDefaultString("TASK_PRICE_PATCH", "")
 	if soraPatchStr != "" {
--- a/common/ip.go
+++ b/common/ip.go
@@ -2,15 +2,6 @@ package common

 import "net"

-func IsIP(s string) bool {
-	ip := net.ParseIP(s)
-	return ip != nil
-}
-
-func ParseIP(s string) net.IP {
-	return net.ParseIP(s)
-}
-
 func IsPrivateIP(ip net.IP) bool {
 	if ip.IsLoopback() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
 		return true
@@ -29,23 +20,3 @@ func IsPrivateIP(ip net.IP) bool {
 	}
 	return false
 }
-
-func IsIpInCIDRList(ip net.IP, cidrList []string) bool {
-	for _, cidr := range cidrList {
-		_, network, err := net.ParseCIDR(cidr)
-		if err != nil {
-			// 尝试作为单个IP处理
-			if whitelistIP := net.ParseIP(cidr); whitelistIP != nil {
-				if ip.Equal(whitelistIP) {
-					return true
-				}
-			}
-			continue
-		}
-
-		if network.Contains(ip) {
-			return true
-		}
-	}
-	return false
-}
--- a/common/json.go
+++ b/common/json.go
@@ -23,11 +23,11 @@ func Marshal(v any) ([]byte, error) {
 }

 func GetJsonType(data json.RawMessage) string {
-	trimmed := bytes.TrimSpace(data)
-	if len(trimmed) == 0 {
+	data = bytes.TrimSpace(data)
+	if len(data) == 0 {
 		return "unknown"
 	}
-	firstChar := trimmed[0]
+	firstChar := bytes.TrimSpace(data)[0]
 	switch firstChar {
 	case '{':
 		return "object"
--- a/common/model.go
+++ b/common/model.go
@@ -17,13 +17,6 @@ var (
 		"flux-",
 		"flux.1-",
 	}
-	OpenAITextModels = []string{
-		"gpt-",
-		"o1",
-		"o3",
-		"o4",
-		"chatgpt",
-	}
 )

 func IsOpenAIResponseOnlyModel(modelName string) bool {
@@ -47,13 +40,3 @@ func IsImageGenerationModel(modelName string) bool {
 	}
 	return false
 }
-
-func IsOpenAITextModel(modelName string) bool {
-	modelName = strings.ToLower(modelName)
-	for _, m := range OpenAITextModels {
-		if strings.Contains(modelName, m) {
-			return true
-		}
-	}
-	return false
-}
--- a/common/pyro.go
+++ b/common/pyro.go
@@ -1,56 +0,0 @@
-package common
-
-import (
-	"runtime"
-
-	"github.com/grafana/pyroscope-go"
-)
-
-func StartPyroScope() error {
-
-	pyroscopeUrl := GetEnvOrDefaultString("PYROSCOPE_URL", "")
-	if pyroscopeUrl == "" {
-		return nil
-	}
-
-	pyroscopeAppName := GetEnvOrDefaultString("PYROSCOPE_APP_NAME", "new-api")
-	pyroscopeBasicAuthUser := GetEnvOrDefaultString("PYROSCOPE_BASIC_AUTH_USER", "")
-	pyroscopeBasicAuthPassword := GetEnvOrDefaultString("PYROSCOPE_BASIC_AUTH_PASSWORD", "")
-	pyroscopeHostname := GetEnvOrDefaultString("HOSTNAME", "new-api")
-
-	mutexRate := GetEnvOrDefault("PYROSCOPE_MUTEX_RATE", 5)
-	blockRate := GetEnvOrDefault("PYROSCOPE_BLOCK_RATE", 5)
-
-	runtime.SetMutexProfileFraction(mutexRate)
-	runtime.SetBlockProfileRate(blockRate)
-
-	_, err := pyroscope.Start(pyroscope.Config{
-		ApplicationName: pyroscopeAppName,
-
-		ServerAddress:     pyroscopeUrl,
-		BasicAuthUser:     pyroscopeBasicAuthUser,
-		BasicAuthPassword: pyroscopeBasicAuthPassword,
-
-		Logger: nil,
-
-		Tags: map[string]string{"hostname": pyroscopeHostname},
-
-		ProfileTypes: []pyroscope.ProfileType{
-			pyroscope.ProfileCPU,
-			pyroscope.ProfileAllocObjects,
-			pyroscope.ProfileAllocSpace,
-			pyroscope.ProfileInuseObjects,
-			pyroscope.ProfileInuseSpace,
-
-			pyroscope.ProfileGoroutines,
-			pyroscope.ProfileMutexCount,
-			pyroscope.ProfileMutexDuration,
-			pyroscope.ProfileBlockCount,
-			pyroscope.ProfileBlockDuration,
-		},
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/common/ssrf_protection.go
+++ b/common/ssrf_protection.go
@@ -186,7 +186,23 @@ func isIPListed(ip net.IP, list []string) bool {
 		return false
 	}

-	return IsIpInCIDRList(ip, list)
+	for _, whitelistCIDR := range list {
+		_, network, err := net.ParseCIDR(whitelistCIDR)
+		if err != nil {
+			// 尝试作为单个IP处理
+			if whitelistIP := net.ParseIP(whitelistCIDR); whitelistIP != nil {
+				if ip.Equal(whitelistIP) {
+					return true
+				}
+			}
+			continue
+		}
+
+		if network.Contains(ip) {
+			return true
+		}
+	}
+	return false
 }

 // IsIPAccessAllowed 检查IP是否允许访问
--- a/common/str.go
+++ b/common/str.go
@@ -3,19 +3,12 @@ package common
 import (
 	"encoding/base64"
 	"encoding/json"
+	"math/rand"
 	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
 	"unsafe"
-
-	"github.com/samber/lo"
-)
-
-var (
-	maskURLPattern    = regexp.MustCompile(`(http|https)://[^\s/$.?#].[^\s]*`)
-	maskDomainPattern = regexp.MustCompile(`\b(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}\b`)
-	maskIPPattern     = regexp.MustCompile(`\b(?:\d{1,3}\.){3}\d{1,3}\b`)
 )

 func GetStringIfEmpty(str string, defaultValue string) string {
@@ -26,10 +19,12 @@ func GetStringIfEmpty(str string, defaultValue string) string {
 }

 func GetRandomString(length int) string {
-	if length <= 0 {
-		return ""
+	//rand.Seed(time.Now().UnixNano())
+	key := make([]byte, length)
+	for i := 0; i < length; i++ {
+		key[i] = keyChars[rand.Intn(len(keyChars))]
 	}
-	return lo.RandomString(length, lo.AlphanumericCharset)
+	return string(key)
 }

 func MapToJsonStr(m map[string]interface{}) string {
@@ -175,7 +170,8 @@ func maskHostForPlainDomain(domain string) string {
 // api.openai.com -> ***.***.com
 func MaskSensitiveInfo(str string) string {
 	// Mask URLs
-	str = maskURLPattern.ReplaceAllStringFunc(str, func(urlStr string) string {
+	urlPattern := regexp.MustCompile(`(http|https)://[^\s/$.?#].[^\s]*`)
+	str = urlPattern.ReplaceAllStringFunc(str, func(urlStr string) string {
 		u, err := url.Parse(urlStr)
 		if err != nil {
 			return urlStr
@@ -228,12 +224,14 @@ func MaskSensitiveInfo(str string) string {
 	})

 	// Mask domain names without protocol (like openai.com, www.openai.com)
-	str = maskDomainPattern.ReplaceAllStringFunc(str, func(domain string) string {
+	domainPattern := regexp.MustCompile(`\b(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}\b`)
+	str = domainPattern.ReplaceAllStringFunc(str, func(domain string) string {
 		return maskHostForPlainDomain(domain)
 	})

 	// Mask IP addresses
-	str = maskIPPattern.ReplaceAllString(str, "***.***.***.***")
+	ipPattern := regexp.MustCompile(`\b(?:\d{1,3}\.){3}\d{1,3}\b`)
+	str = ipPattern.ReplaceAllString(str, "***.***.***.***")

 	return str
 }
--- a/common/utils.go
+++ b/common/utils.go
@@ -217,6 +217,11 @@ func IntMax(a int, b int) int {
 	}
 }

+func IsIP(s string) bool {
+	ip := net.ParseIP(s)
+	return ip != nil
+}
+
 func GetUUID() string {
 	code := uuid.New().String()
 	code = strings.Replace(code, "-", "", -1)
--- a/constant/channel.go
+++ b/constant/channel.go
@@ -180,27 +180,3 @@ func GetChannelTypeName(channelType int) string {
 	}
 	return "Unknown"
 }
-
-type ChannelSpecialBase struct {
-	ClaudeBaseURL string
-	OpenAIBaseURL string
-}
-
-var ChannelSpecialBases = map[string]ChannelSpecialBase{
-	"glm-coding-plan": {
-		ClaudeBaseURL: "https://open.bigmodel.cn/api/anthropic",
-		OpenAIBaseURL: "https://open.bigmodel.cn/api/coding/paas/v4",
-	},
-	"glm-coding-plan-international": {
-		ClaudeBaseURL: "https://api.z.ai/api/anthropic",
-		OpenAIBaseURL: "https://api.z.ai/api/coding/paas/v4",
-	},
-	"kimi-coding-plan": {
-		ClaudeBaseURL: "https://api.kimi.com/coding",
-		OpenAIBaseURL: "https://api.kimi.com/coding/v1",
-	},
-	"doubao-coding-plan": {
-		ClaudeBaseURL: "https://ark.cn-beijing.volces.com/api/coding",
-		OpenAIBaseURL: "https://ark.cn-beijing.volces.com/api/coding/v3",
-	},
-}
--- a/constant/context_key.go
+++ b/constant/context_key.go
@@ -3,9 +3,8 @@ package constant
 type ContextKey string

 const (
-	ContextKeyTokenCountMeta  ContextKey = "token_count_meta"
-	ContextKeyPromptTokens    ContextKey = "prompt_tokens"
-	ContextKeyEstimatedTokens ContextKey = "estimated_tokens"
+	ContextKeyTokenCountMeta ContextKey = "token_count_meta"
+	ContextKeyPromptTokens   ContextKey = "prompt_tokens"

 	ContextKeyOriginalModel    ContextKey = "original_model"
 	ContextKeyRequestStartTime ContextKey = "request_start_time"
@@ -18,7 +17,6 @@ const (
 	ContextKeyTokenSpecificChannelId ContextKey = "specific_channel_id"
 	ContextKeyTokenModelLimitEnabled ContextKey = "token_model_limit_enabled"
 	ContextKeyTokenModelLimit        ContextKey = "token_model_limit"
-	ContextKeyTokenCrossGroupRetry   ContextKey = "token_cross_group_retry"

 	/* channel related keys */
 	ContextKeyChannelId                ContextKey = "channel_id"
@@ -38,10 +36,6 @@ const (
 	ContextKeyChannelMultiKeyIndex     ContextKey = "channel_multi_key_index"
 	ContextKeyChannelKey               ContextKey = "channel_key"

-	ContextKeyAutoGroup           ContextKey = "auto_group"
-	ContextKeyAutoGroupIndex      ContextKey = "auto_group_index"
-	ContextKeyAutoGroupRetryIndex ContextKey = "auto_group_retry_index"
-
 	/* user related keys */
 	ContextKeyUserId      ContextKey = "id"
 	ContextKeyUserSetting ContextKey = "user_setting"
--- a/constant/env.go
+++ b/constant/env.go
@@ -3,20 +3,17 @@ package constant
 var StreamingTimeout int
 var DifyDebug bool
 var MaxFileDownloadMB int
-var StreamScannerMaxBufferMB int
 var ForceStreamOption bool
 var CountToken bool
 var GetMediaToken bool
 var GetMediaTokenNotStream bool
 var UpdateTask bool
-var MaxRequestBodyMB int
 var AzureDefaultAPIVersion string
 var GeminiVisionMaxImageNum int
 var NotifyLimitCount int
 var NotificationLimitDurationMinute int
 var GenerateDefaultToken bool
 var ErrorLogEnabled bool
-var TaskQueryLimit int

 // temporary variable for sora patch, will be removed in future
 var TaskPricePatches []string
--- a/constant/task.go
+++ b/constant/task.go
@@ -15,7 +15,6 @@ const (
 	TaskActionTextGenerate      = "textGenerate"
 	TaskActionFirstTailGenerate = "firstTailGenerate"
 	TaskActionReferenceGenerate = "referenceGenerate"
-	TaskActionRemix             = "remixGenerate"
 )

 var SunoModel2Action = map[string]string{
--- a/controller/billing.go
+++ b/controller/billing.go
@@ -2,9 +2,9 @@ package controller

 import (
 	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/model"
 	"github.com/QuantumNous/new-api/setting/operation_setting"
-	"github.com/QuantumNous/new-api/types"
 	"github.com/gin-gonic/gin"
 )

@@ -29,7 +29,7 @@ func GetSubscription(c *gin.Context) {
 		expiredTime = 0
 	}
 	if err != nil {
-		openAIError := types.OpenAIError{
+		openAIError := dto.OpenAIError{
 			Message: err.Error(),
 			Type:    "upstream_error",
 		}
@@ -81,7 +81,7 @@ func GetUsage(c *gin.Context) {
 		quota, err = model.GetUserUsedQuota(userId)
 	}
 	if err != nil {
-		openAIError := types.OpenAIError{
+		openAIError := dto.OpenAIError{
 			Message: err.Error(),
 			Type:    "new_api_error",
 		}
--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -97,11 +97,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		if channel.Type == constant.ChannelTypeVolcEngine && strings.Contains(testModel, "seedream") {
 			requestPath = "/v1/images/generations"
 		}
-
-		// responses-only models
-		if strings.Contains(strings.ToLower(testModel), "codex") {
-			requestPath = "/v1/responses"
-		}
 	}

 	c.Request = &http.Request{
@@ -181,7 +176,7 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		}
 	}

-	request := buildTestRequest(testModel, endpointType, channel)
+	request := buildTestRequest(testModel, endpointType)

 	info, err := relaycommon.GenRelayInfo(c, relayFormat, request, nil)

@@ -324,16 +319,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		httpResp = resp.(*http.Response)
 		if httpResp.StatusCode != http.StatusOK {
 			err := service.RelayErrorHandler(c.Request.Context(), httpResp, true)
-			common.SysError(fmt.Sprintf(
-				"channel test bad response: channel_id=%d name=%s type=%d model=%s endpoint_type=%s status=%d err=%v",
-				channel.Id,
-				channel.Name,
-				channel.Type,
-				testModel,
-				endpointType,
-				httpResp.StatusCode,
-				err,
-			))
 			return testResult{
 				context:     c,
 				localErr:    err,
@@ -366,7 +351,7 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 			newAPIError: types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError),
 		}
 	}
-	info.SetEstimatePromptTokens(usage.PromptTokens)
+	info.PromptTokens = usage.PromptTokens

 	quota := 0
 	if !priceData.UsePrice {
@@ -404,7 +389,7 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 	}
 }

-func buildTestRequest(model string, endpointType string, channel *model.Channel) dto.Request {
+func buildTestRequest(model string, endpointType string) dto.Request {
 	// 根据端点类型构建不同的测试请求
 	if endpointType != "" {
 		switch constant.EndpointType(endpointType) {
@@ -438,7 +423,7 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 			}
 		case constant.EndpointTypeAnthropic, constant.EndpointTypeGemini, constant.EndpointTypeOpenAI:
 			// 返回 GeneralOpenAIRequest
-			maxTokens := uint(16)
+			maxTokens := uint(10)
 			if constant.EndpointType(endpointType) == constant.EndpointTypeGemini {
 				maxTokens = 3000
 			}
@@ -468,14 +453,6 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 		}
 	}

-	// Responses-only models (e.g. codex series)
-	if strings.Contains(strings.ToLower(model), "codex") {
-		return &dto.OpenAIResponsesRequest{
-			Model: model,
-			Input: json.RawMessage("\"hi\""),
-		}
-	}
-
 	// Chat/Completion 请求 - 返回 GeneralOpenAIRequest
 	testRequest := &dto.GeneralOpenAIRequest{
 		Model:  model,
@@ -489,7 +466,7 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 	}

 	if strings.HasPrefix(model, "o") {
-		testRequest.MaxCompletionTokens = 16
+		testRequest.MaxCompletionTokens = 10
 	} else if strings.Contains(model, "thinking") {
 		if !strings.Contains(model, "claude") {
 			testRequest.MaxTokens = 50
@@ -497,7 +474,7 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 	} else if strings.Contains(model, "gemini") {
 		testRequest.MaxTokens = 3000
 	} else {
-		testRequest.MaxTokens = 16
+		testRequest.MaxTokens = 10
 	}

 	return testRequest
--- a/controller/channel.go
+++ b/controller/channel.go
@@ -11,18 +11,17 @@ import (
 	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/relay/channel/ollama"
+	"github.com/QuantumNous/new-api/relay/channel/volcengine"
 	"github.com/QuantumNous/new-api/service"

 	"github.com/gin-gonic/gin"
 )

 type OpenAIModel struct {
-	ID         string         `json:"id"`
-	Object     string         `json:"object"`
-	Created    int64          `json:"created"`
-	OwnedBy    string         `json:"owned_by"`
-	Metadata   map[string]any `json:"metadata,omitempty"`
+	ID         string `json:"id"`
+	Object     string `json:"object"`
+	Created    int64  `json:"created"`
+	OwnedBy    string `json:"owned_by"`
 	Permission []struct {
 		ID                 string `json:"id"`
 		Object             string `json:"object"`
@@ -167,30 +166,6 @@ func GetAllChannels(c *gin.Context) {
 	return
 }

-func buildFetchModelsHeaders(channel *model.Channel, key string) (http.Header, error) {
-	var headers http.Header
-	switch channel.Type {
-	case constant.ChannelTypeAnthropic:
-		headers = GetClaudeAuthHeader(key)
-	default:
-		headers = GetAuthHeader(key)
-	}
-
-	headerOverride := channel.GetHeaderOverride()
-	for k, v := range headerOverride {
-		str, ok := v.(string)
-		if !ok {
-			return nil, fmt.Errorf("invalid header override for key %s", k)
-		}
-		if strings.Contains(str, "{api_key}") {
-			str = strings.ReplaceAll(str, "{api_key}", key)
-		}
-		headers.Set(k, str)
-	}
-
-	return headers, nil
-}
-
 func FetchUpstreamModels(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
@@ -209,57 +184,6 @@ func FetchUpstreamModels(c *gin.Context) {
 		baseURL = channel.GetBaseURL()
 	}

-	// 对于 Ollama 渠道，使用特殊处理
-	if channel.Type == constant.ChannelTypeOllama {
-		key := strings.Split(channel.Key, "\n")[0]
-		models, err := ollama.FetchOllamaModels(baseURL, key)
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("获取Ollama模型失败: %s", err.Error()),
-			})
-			return
-		}
-
-		result := OpenAIModelsResponse{
-			Data: make([]OpenAIModel, 0, len(models)),
-		}
-
-		for _, modelInfo := range models {
-			metadata := map[string]any{}
-			if modelInfo.Size > 0 {
-				metadata["size"] = modelInfo.Size
-			}
-			if modelInfo.Digest != "" {
-				metadata["digest"] = modelInfo.Digest
-			}
-			if modelInfo.ModifiedAt != "" {
-				metadata["modified_at"] = modelInfo.ModifiedAt
-			}
-			details := modelInfo.Details
-			if details.ParentModel != "" || details.Format != "" || details.Family != "" || len(details.Families) > 0 || details.ParameterSize != "" || details.QuantizationLevel != "" {
-				metadata["details"] = modelInfo.Details
-			}
-			if len(metadata) == 0 {
-				metadata = nil
-			}
-
-			result.Data = append(result.Data, OpenAIModel{
-				ID:       modelInfo.Name,
-				Object:   "model",
-				Created:  0,
-				OwnedBy:  "ollama",
-				Metadata: metadata,
-			})
-		}
-
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"data":    result.Data,
-		})
-		return
-	}
-
 	var url string
 	switch channel.Type {
 	case constant.ChannelTypeGemini:
@@ -268,20 +192,10 @@ func FetchUpstreamModels(c *gin.Context) {
 	case constant.ChannelTypeAli:
 		url = fmt.Sprintf("%s/compatible-mode/v1/models", baseURL)
 	case constant.ChannelTypeZhipu_v4:
-		if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" {
-			url = fmt.Sprintf("%s/models", plan.OpenAIBaseURL)
-		} else {
-			url = fmt.Sprintf("%s/api/paas/v4/models", baseURL)
-		}
+		url = fmt.Sprintf("%s/api/paas/v4/models", baseURL)
 	case constant.ChannelTypeVolcEngine:
-		if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" {
-			url = fmt.Sprintf("%s/v1/models", plan.OpenAIBaseURL)
-		} else {
-			url = fmt.Sprintf("%s/v1/models", baseURL)
-		}
-	case constant.ChannelTypeMoonshot:
-		if plan, ok := constant.ChannelSpecialBases[baseURL]; ok && plan.OpenAIBaseURL != "" {
-			url = fmt.Sprintf("%s/models", plan.OpenAIBaseURL)
+		if baseURL == volcengine.DoubaoCodingPlan {
+			url = fmt.Sprintf("%s/v1/models", volcengine.DoubaoCodingPlanOpenAIBaseURL)
 		} else {
 			url = fmt.Sprintf("%s/v1/models", baseURL)
 		}
@@ -300,13 +214,14 @@ func FetchUpstreamModels(c *gin.Context) {
 	}
 	key = strings.TrimSpace(key)

-	headers, err := buildFetchModelsHeaders(channel, key)
-	if err != nil {
-		common.ApiError(c, err)
-		return
+	// 获取响应体 - 根据渠道类型决定是否添加 AuthHeader
+	var body []byte
+	switch channel.Type {
+	case constant.ChannelTypeAnthropic:
+		body, err = GetResponseBody("GET", url, channel, GetClaudeAuthHeader(key))
+	default:
+		body, err = GetResponseBody("GET", url, channel, GetAuthHeader(key))
 	}
-
-	body, err := GetResponseBody("GET", url, channel, headers)
 	if err != nil {
 		common.ApiError(c, err)
 		return
@@ -970,6 +885,9 @@ func UpdateChannel(c *gin.Context) {
 						// 单个JSON密钥
 						newKeys = []string{channel.Key}
 					}
+					// 合并密钥
+					allKeys := append(existingKeys, newKeys...)
+					channel.Key = strings.Join(allKeys, "\n")
 				} else {
 					// 普通渠道的处理
 					inputKeys := strings.Split(channel.Key, "\n")
@@ -979,31 +897,10 @@ func UpdateChannel(c *gin.Context) {
 							newKeys = append(newKeys, key)
 						}
 					}
+					// 合并密钥
+					allKeys := append(existingKeys, newKeys...)
+					channel.Key = strings.Join(allKeys, "\n")
 				}
-
-				seen := make(map[string]struct{}, len(existingKeys)+len(newKeys))
-				for _, key := range existingKeys {
-					normalized := strings.TrimSpace(key)
-					if normalized == "" {
-						continue
-					}
-					seen[normalized] = struct{}{}
-				}
-				dedupedNewKeys := make([]string, 0, len(newKeys))
-				for _, key := range newKeys {
-					normalized := strings.TrimSpace(key)
-					if normalized == "" {
-						continue
-					}
-					if _, ok := seen[normalized]; ok {
-						continue
-					}
-					seen[normalized] = struct{}{}
-					dedupedNewKeys = append(dedupedNewKeys, normalized)
-				}
-
-				allKeys := append(existingKeys, dedupedNewKeys...)
-				channel.Key = strings.Join(allKeys, "\n")
 			}
 		case "replace":
 			// 覆盖模式：直接使用新密钥（默认行为，不需要特殊处理）
@@ -1046,32 +943,6 @@ func FetchModels(c *gin.Context) {
 		baseURL = constant.ChannelBaseURLs[req.Type]
 	}

-	// remove line breaks and extra spaces.
-	key := strings.TrimSpace(req.Key)
-	key = strings.Split(key, "\n")[0]
-
-	if req.Type == constant.ChannelTypeOllama {
-		models, err := ollama.FetchOllamaModels(baseURL, key)
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("获取Ollama模型失败: %s", err.Error()),
-			})
-			return
-		}
-
-		names := make([]string, 0, len(models))
-		for _, modelInfo := range models {
-			names = append(names, modelInfo.Name)
-		}
-
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"data":    names,
-		})
-		return
-	}
-
 	client := &http.Client{}
 	url := fmt.Sprintf("%s/v1/models", baseURL)

@@ -1084,6 +955,10 @@ func FetchModels(c *gin.Context) {
 		return
 	}

+	// remove line breaks and extra spaces.
+	key := strings.TrimSpace(req.Key)
+	// If the key contains a line break, only take the first part.
+	key = strings.Split(key, "\n")[0]
 	request.Header.Set("Authorization", "Bearer "+key)

 	response, err := client.Do(request)
@@ -1733,262 +1608,3 @@ func ManageMultiKeys(c *gin.Context) {
 		return
 	}
 }
-
-// OllamaPullModel 拉取 Ollama 模型
-func OllamaPullModel(c *gin.Context) {
-	var req struct {
-		ChannelID int    `json:"channel_id"`
-		ModelName string `json:"model_name"`
-	}
-
-	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Invalid request parameters",
-		})
-		return
-	}
-
-	if req.ChannelID == 0 || req.ModelName == "" {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Channel ID and model name are required",
-		})
-		return
-	}
-
-	// 获取渠道信息
-	channel, err := model.GetChannelById(req.ChannelID, true)
-	if err != nil {
-		c.JSON(http.StatusNotFound, gin.H{
-			"success": false,
-			"message": "Channel not found",
-		})
-		return
-	}
-
-	// 检查是否是 Ollama 渠道
-	if channel.Type != constant.ChannelTypeOllama {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "This operation is only supported for Ollama channels",
-		})
-		return
-	}
-
-	baseURL := constant.ChannelBaseURLs[channel.Type]
-	if channel.GetBaseURL() != "" {
-		baseURL = channel.GetBaseURL()
-	}
-
-	key := strings.Split(channel.Key, "\n")[0]
-	err = ollama.PullOllamaModel(baseURL, key, req.ModelName)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"success": false,
-			"message": fmt.Sprintf("Failed to pull model: %s", err.Error()),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": fmt.Sprintf("Model %s pulled successfully", req.ModelName),
-	})
-}
-
-// OllamaPullModelStream 流式拉取 Ollama 模型
-func OllamaPullModelStream(c *gin.Context) {
-	var req struct {
-		ChannelID int    `json:"channel_id"`
-		ModelName string `json:"model_name"`
-	}
-
-	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Invalid request parameters",
-		})
-		return
-	}
-
-	if req.ChannelID == 0 || req.ModelName == "" {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Channel ID and model name are required",
-		})
-		return
-	}
-
-	// 获取渠道信息
-	channel, err := model.GetChannelById(req.ChannelID, true)
-	if err != nil {
-		c.JSON(http.StatusNotFound, gin.H{
-			"success": false,
-			"message": "Channel not found",
-		})
-		return
-	}
-
-	// 检查是否是 Ollama 渠道
-	if channel.Type != constant.ChannelTypeOllama {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "This operation is only supported for Ollama channels",
-		})
-		return
-	}
-
-	baseURL := constant.ChannelBaseURLs[channel.Type]
-	if channel.GetBaseURL() != "" {
-		baseURL = channel.GetBaseURL()
-	}
-
-	// 设置 SSE 头部
-	c.Header("Content-Type", "text/event-stream")
-	c.Header("Cache-Control", "no-cache")
-	c.Header("Connection", "keep-alive")
-	c.Header("Access-Control-Allow-Origin", "*")
-
-	key := strings.Split(channel.Key, "\n")[0]
-
-	// 创建进度回调函数
-	progressCallback := func(progress ollama.OllamaPullResponse) {
-		data, _ := json.Marshal(progress)
-		fmt.Fprintf(c.Writer, "data: %s\n\n", string(data))
-		c.Writer.Flush()
-	}
-
-	// 执行拉取
-	err = ollama.PullOllamaModelStream(baseURL, key, req.ModelName, progressCallback)
-
-	if err != nil {
-		errorData, _ := json.Marshal(gin.H{
-			"error": err.Error(),
-		})
-		fmt.Fprintf(c.Writer, "data: %s\n\n", string(errorData))
-	} else {
-		successData, _ := json.Marshal(gin.H{
-			"message": fmt.Sprintf("Model %s pulled successfully", req.ModelName),
-		})
-		fmt.Fprintf(c.Writer, "data: %s\n\n", string(successData))
-	}
-
-	// 发送结束标志
-	fmt.Fprintf(c.Writer, "data: [DONE]\n\n")
-	c.Writer.Flush()
-}
-
-// OllamaDeleteModel 删除 Ollama 模型
-func OllamaDeleteModel(c *gin.Context) {
-	var req struct {
-		ChannelID int    `json:"channel_id"`
-		ModelName string `json:"model_name"`
-	}
-
-	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Invalid request parameters",
-		})
-		return
-	}
-
-	if req.ChannelID == 0 || req.ModelName == "" {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Channel ID and model name are required",
-		})
-		return
-	}
-
-	// 获取渠道信息
-	channel, err := model.GetChannelById(req.ChannelID, true)
-	if err != nil {
-		c.JSON(http.StatusNotFound, gin.H{
-			"success": false,
-			"message": "Channel not found",
-		})
-		return
-	}
-
-	// 检查是否是 Ollama 渠道
-	if channel.Type != constant.ChannelTypeOllama {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "This operation is only supported for Ollama channels",
-		})
-		return
-	}
-
-	baseURL := constant.ChannelBaseURLs[channel.Type]
-	if channel.GetBaseURL() != "" {
-		baseURL = channel.GetBaseURL()
-	}
-
-	key := strings.Split(channel.Key, "\n")[0]
-	err = ollama.DeleteOllamaModel(baseURL, key, req.ModelName)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"success": false,
-			"message": fmt.Sprintf("Failed to delete model: %s", err.Error()),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": fmt.Sprintf("Model %s deleted successfully", req.ModelName),
-	})
-}
-
-// OllamaVersion 获取 Ollama 服务版本信息
-func OllamaVersion(c *gin.Context) {
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "Invalid channel id",
-		})
-		return
-	}
-
-	channel, err := model.GetChannelById(id, true)
-	if err != nil {
-		c.JSON(http.StatusNotFound, gin.H{
-			"success": false,
-			"message": "Channel not found",
-		})
-		return
-	}
-
-	if channel.Type != constant.ChannelTypeOllama {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "This operation is only supported for Ollama channels",
-		})
-		return
-	}
-
-	baseURL := constant.ChannelBaseURLs[channel.Type]
-	if channel.GetBaseURL() != "" {
-		baseURL = channel.GetBaseURL()
-	}
-
-	key := strings.Split(channel.Key, "\n")[0]
-	version, err := ollama.FetchOllamaVersion(baseURL, key)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": fmt.Sprintf("获取Ollama版本失败: %s", err.Error()),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"data": gin.H{
-			"version": version,
-		},
-	})
-}
--- a/controller/checkin.go
+++ b/controller/checkin.go
@@ -1,72 +0,0 @@
-package controller
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/logger"
-	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/setting/operation_setting"
-	"github.com/gin-gonic/gin"
-)
-
-// GetCheckinStatus 获取用户签到状态和历史记录
-func GetCheckinStatus(c *gin.Context) {
-	setting := operation_setting.GetCheckinSetting()
-	if !setting.Enabled {
-		common.ApiErrorMsg(c, "签到功能未启用")
-		return
-	}
-	userId := c.GetInt("id")
-	// 获取月份参数，默认为当前月份
-	month := c.DefaultQuery("month", time.Now().Format("2006-01"))
-
-	stats, err := model.GetUserCheckinStats(userId, month)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"data": gin.H{
-			"enabled":   setting.Enabled,
-			"min_quota": setting.MinQuota,
-			"max_quota": setting.MaxQuota,
-			"stats":     stats,
-		},
-	})
-}
-
-// DoCheckin 执行用户签到
-func DoCheckin(c *gin.Context) {
-	setting := operation_setting.GetCheckinSetting()
-	if !setting.Enabled {
-		common.ApiErrorMsg(c, "签到功能未启用")
-		return
-	}
-
-	userId := c.GetInt("id")
-
-	checkin, err := model.UserCheckin(userId)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-	model.RecordLog(userId, model.LogTypeSystem, fmt.Sprintf("用户签到，获得额度 %s", logger.LogQuota(checkin.QuotaAwarded)))
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "签到成功",
-		"data": gin.H{
-			"quota_awarded": checkin.QuotaAwarded,
-			"checkin_date":  checkin.CheckinDate},
-	})
-}
--- a/controller/deployment.go
+++ b/controller/deployment.go
@@ -1,810 +0,0 @@
-package controller
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/pkg/ionet"
-	"github.com/gin-gonic/gin"
-)
-
-func getIoAPIKey(c *gin.Context) (string, bool) {
-	common.OptionMapRWMutex.RLock()
-	enabled := common.OptionMap["model_deployment.ionet.enabled"] == "true"
-	apiKey := common.OptionMap["model_deployment.ionet.api_key"]
-	common.OptionMapRWMutex.RUnlock()
-	if !enabled || strings.TrimSpace(apiKey) == "" {
-		common.ApiErrorMsg(c, "io.net model deployment is not enabled or api key missing")
-		return "", false
-	}
-	return apiKey, true
-}
-
-func GetModelDeploymentSettings(c *gin.Context) {
-	common.OptionMapRWMutex.RLock()
-	enabled := common.OptionMap["model_deployment.ionet.enabled"] == "true"
-	hasAPIKey := strings.TrimSpace(common.OptionMap["model_deployment.ionet.api_key"]) != ""
-	common.OptionMapRWMutex.RUnlock()
-
-	common.ApiSuccess(c, gin.H{
-		"provider":    "io.net",
-		"enabled":     enabled,
-		"configured":  hasAPIKey,
-		"can_connect": enabled && hasAPIKey,
-	})
-}
-
-func getIoClient(c *gin.Context) (*ionet.Client, bool) {
-	apiKey, ok := getIoAPIKey(c)
-	if !ok {
-		return nil, false
-	}
-	return ionet.NewClient(apiKey), true
-}
-
-func getIoEnterpriseClient(c *gin.Context) (*ionet.Client, bool) {
-	apiKey, ok := getIoAPIKey(c)
-	if !ok {
-		return nil, false
-	}
-	return ionet.NewEnterpriseClient(apiKey), true
-}
-
-func TestIoNetConnection(c *gin.Context) {
-	var req struct {
-		APIKey string `json:"api_key"`
-	}
-
-	rawBody, err := c.GetRawData()
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-	if len(bytes.TrimSpace(rawBody)) > 0 {
-		if err := json.Unmarshal(rawBody, &req); err != nil {
-			common.ApiErrorMsg(c, "invalid request payload")
-			return
-		}
-	}
-
-	apiKey := strings.TrimSpace(req.APIKey)
-	if apiKey == "" {
-		common.OptionMapRWMutex.RLock()
-		storedKey := strings.TrimSpace(common.OptionMap["model_deployment.ionet.api_key"])
-		common.OptionMapRWMutex.RUnlock()
-		if storedKey == "" {
-			common.ApiErrorMsg(c, "api_key is required")
-			return
-		}
-		apiKey = storedKey
-	}
-
-	client := ionet.NewEnterpriseClient(apiKey)
-	result, err := client.GetMaxGPUsPerContainer()
-	if err != nil {
-		if apiErr, ok := err.(*ionet.APIError); ok {
-			message := strings.TrimSpace(apiErr.Message)
-			if message == "" {
-				message = "failed to validate api key"
-			}
-			common.ApiErrorMsg(c, message)
-			return
-		}
-		common.ApiError(c, err)
-		return
-	}
-
-	totalHardware := 0
-	totalAvailable := 0
-	if result != nil {
-		totalHardware = len(result.Hardware)
-		totalAvailable = result.Total
-		if totalAvailable == 0 {
-			for _, hw := range result.Hardware {
-				totalAvailable += hw.Available
-			}
-		}
-	}
-
-	common.ApiSuccess(c, gin.H{
-		"hardware_count":  totalHardware,
-		"total_available": totalAvailable,
-	})
-}
-
-func requireDeploymentID(c *gin.Context) (string, bool) {
-	deploymentID := strings.TrimSpace(c.Param("id"))
-	if deploymentID == "" {
-		common.ApiErrorMsg(c, "deployment ID is required")
-		return "", false
-	}
-	return deploymentID, true
-}
-
-func requireContainerID(c *gin.Context) (string, bool) {
-	containerID := strings.TrimSpace(c.Param("container_id"))
-	if containerID == "" {
-		common.ApiErrorMsg(c, "container ID is required")
-		return "", false
-	}
-	return containerID, true
-}
-
-func mapIoNetDeployment(d ionet.Deployment) map[string]interface{} {
-	var created int64
-	if d.CreatedAt.IsZero() {
-		created = time.Now().Unix()
-	} else {
-		created = d.CreatedAt.Unix()
-	}
-
-	timeRemainingHours := d.ComputeMinutesRemaining / 60
-	timeRemainingMins := d.ComputeMinutesRemaining % 60
-	var timeRemaining string
-	if timeRemainingHours > 0 {
-		timeRemaining = fmt.Sprintf("%d hour %d minutes", timeRemainingHours, timeRemainingMins)
-	} else if timeRemainingMins > 0 {
-		timeRemaining = fmt.Sprintf("%d minutes", timeRemainingMins)
-	} else {
-		timeRemaining = "completed"
-	}
-
-	hardwareInfo := fmt.Sprintf("%s %s x%d", d.BrandName, d.HardwareName, d.HardwareQuantity)
-
-	return map[string]interface{}{
-		"id":                        d.ID,
-		"deployment_name":           d.Name,
-		"container_name":            d.Name,
-		"status":                    strings.ToLower(d.Status),
-		"type":                      "Container",
-		"time_remaining":            timeRemaining,
-		"time_remaining_minutes":    d.ComputeMinutesRemaining,
-		"hardware_info":             hardwareInfo,
-		"hardware_name":             d.HardwareName,
-		"brand_name":                d.BrandName,
-		"hardware_quantity":         d.HardwareQuantity,
-		"completed_percent":         d.CompletedPercent,
-		"compute_minutes_served":    d.ComputeMinutesServed,
-		"compute_minutes_remaining": d.ComputeMinutesRemaining,
-		"created_at":                created,
-		"updated_at":                created,
-		"model_name":                "",
-		"model_version":             "",
-		"instance_count":            d.HardwareQuantity,
-		"resource_config": map[string]interface{}{
-			"cpu":    "",
-			"memory": "",
-			"gpu":    strconv.Itoa(d.HardwareQuantity),
-		},
-		"description": "",
-		"provider":    "io.net",
-	}
-}
-
-func computeStatusCounts(total int, deployments []ionet.Deployment) map[string]int64 {
-	counts := map[string]int64{
-		"all": int64(total),
-	}
-
-	for _, status := range []string{"running", "completed", "failed", "deployment requested", "termination requested", "destroyed"} {
-		counts[status] = 0
-	}
-
-	for _, d := range deployments {
-		status := strings.ToLower(strings.TrimSpace(d.Status))
-		counts[status] = counts[status] + 1
-	}
-
-	return counts
-}
-
-func GetAllDeployments(c *gin.Context) {
-	pageInfo := common.GetPageQuery(c)
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	status := c.Query("status")
-	opts := &ionet.ListDeploymentsOptions{
-		Status:    strings.ToLower(strings.TrimSpace(status)),
-		Page:      pageInfo.GetPage(),
-		PageSize:  pageInfo.GetPageSize(),
-		SortBy:    "created_at",
-		SortOrder: "desc",
-	}
-
-	dl, err := client.ListDeployments(opts)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	items := make([]map[string]interface{}, 0, len(dl.Deployments))
-	for _, d := range dl.Deployments {
-		items = append(items, mapIoNetDeployment(d))
-	}
-
-	data := gin.H{
-		"page":          pageInfo.GetPage(),
-		"page_size":     pageInfo.GetPageSize(),
-		"total":         dl.Total,
-		"items":         items,
-		"status_counts": computeStatusCounts(dl.Total, dl.Deployments),
-	}
-	common.ApiSuccess(c, data)
-}
-
-func SearchDeployments(c *gin.Context) {
-	pageInfo := common.GetPageQuery(c)
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	status := strings.ToLower(strings.TrimSpace(c.Query("status")))
-	keyword := strings.TrimSpace(c.Query("keyword"))
-
-	dl, err := client.ListDeployments(&ionet.ListDeploymentsOptions{
-		Status:    status,
-		Page:      pageInfo.GetPage(),
-		PageSize:  pageInfo.GetPageSize(),
-		SortBy:    "created_at",
-		SortOrder: "desc",
-	})
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	filtered := make([]ionet.Deployment, 0, len(dl.Deployments))
-	if keyword == "" {
-		filtered = dl.Deployments
-	} else {
-		kw := strings.ToLower(keyword)
-		for _, d := range dl.Deployments {
-			if strings.Contains(strings.ToLower(d.Name), kw) {
-				filtered = append(filtered, d)
-			}
-		}
-	}
-
-	items := make([]map[string]interface{}, 0, len(filtered))
-	for _, d := range filtered {
-		items = append(items, mapIoNetDeployment(d))
-	}
-
-	total := dl.Total
-	if keyword != "" {
-		total = len(filtered)
-	}
-
-	data := gin.H{
-		"page":      pageInfo.GetPage(),
-		"page_size": pageInfo.GetPageSize(),
-		"total":     total,
-		"items":     items,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func GetDeployment(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	details, err := client.GetDeployment(deploymentID)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := map[string]interface{}{
-		"id":              details.ID,
-		"deployment_name": details.ID,
-		"model_name":      "",
-		"model_version":   "",
-		"status":          strings.ToLower(details.Status),
-		"instance_count":  details.TotalContainers,
-		"hardware_id":     details.HardwareID,
-		"resource_config": map[string]interface{}{
-			"cpu":    "",
-			"memory": "",
-			"gpu":    strconv.Itoa(details.TotalGPUs),
-		},
-		"created_at":                details.CreatedAt.Unix(),
-		"updated_at":                details.CreatedAt.Unix(),
-		"description":               "",
-		"amount_paid":               details.AmountPaid,
-		"completed_percent":         details.CompletedPercent,
-		"gpus_per_container":        details.GPUsPerContainer,
-		"total_gpus":                details.TotalGPUs,
-		"total_containers":          details.TotalContainers,
-		"hardware_name":             details.HardwareName,
-		"brand_name":                details.BrandName,
-		"compute_minutes_served":    details.ComputeMinutesServed,
-		"compute_minutes_remaining": details.ComputeMinutesRemaining,
-		"locations":                 details.Locations,
-		"container_config":          details.ContainerConfig,
-	}
-
-	common.ApiSuccess(c, data)
-}
-
-func UpdateDeploymentName(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	var req struct {
-		Name string `json:"name" binding:"required"`
-	}
-
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	updateReq := &ionet.UpdateClusterNameRequest{
-		Name: strings.TrimSpace(req.Name),
-	}
-
-	if updateReq.Name == "" {
-		common.ApiErrorMsg(c, "deployment name cannot be empty")
-		return
-	}
-
-	available, err := client.CheckClusterNameAvailability(updateReq.Name)
-	if err != nil {
-		common.ApiError(c, fmt.Errorf("failed to check name availability: %w", err))
-		return
-	}
-
-	if !available {
-		common.ApiErrorMsg(c, "deployment name is not available, please choose a different name")
-		return
-	}
-
-	resp, err := client.UpdateClusterName(deploymentID, updateReq)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"status":  resp.Status,
-		"message": resp.Message,
-		"id":      deploymentID,
-		"name":    updateReq.Name,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func UpdateDeployment(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	var req ionet.UpdateDeploymentRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	resp, err := client.UpdateDeployment(deploymentID, &req)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"status":        resp.Status,
-		"deployment_id": resp.DeploymentID,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func ExtendDeployment(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	var req ionet.ExtendDurationRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	details, err := client.ExtendDeployment(deploymentID, &req)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := mapIoNetDeployment(ionet.Deployment{
-		ID:                      details.ID,
-		Status:                  details.Status,
-		Name:                    deploymentID,
-		CompletedPercent:        float64(details.CompletedPercent),
-		HardwareQuantity:        details.TotalGPUs,
-		BrandName:               details.BrandName,
-		HardwareName:            details.HardwareName,
-		ComputeMinutesServed:    details.ComputeMinutesServed,
-		ComputeMinutesRemaining: details.ComputeMinutesRemaining,
-		CreatedAt:               details.CreatedAt,
-	})
-
-	common.ApiSuccess(c, data)
-}
-
-func DeleteDeployment(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	resp, err := client.DeleteDeployment(deploymentID)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"status":        resp.Status,
-		"deployment_id": resp.DeploymentID,
-		"message":       "Deployment termination requested successfully",
-	}
-	common.ApiSuccess(c, data)
-}
-
-func CreateDeployment(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	var req ionet.DeploymentRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	resp, err := client.DeployContainer(&req)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"deployment_id": resp.DeploymentID,
-		"status":        resp.Status,
-		"message":       "Deployment created successfully",
-	}
-	common.ApiSuccess(c, data)
-}
-
-func GetHardwareTypes(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	hardwareTypes, totalAvailable, err := client.ListHardwareTypes()
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"hardware_types":  hardwareTypes,
-		"total":           len(hardwareTypes),
-		"total_available": totalAvailable,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func GetLocations(c *gin.Context) {
-	client, ok := getIoClient(c)
-	if !ok {
-		return
-	}
-
-	locationsResp, err := client.ListLocations()
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	total := locationsResp.Total
-	if total == 0 {
-		total = len(locationsResp.Locations)
-	}
-
-	data := gin.H{
-		"locations": locationsResp.Locations,
-		"total":     total,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func GetAvailableReplicas(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	hardwareIDStr := c.Query("hardware_id")
-	gpuCountStr := c.Query("gpu_count")
-
-	if hardwareIDStr == "" {
-		common.ApiErrorMsg(c, "hardware_id parameter is required")
-		return
-	}
-
-	hardwareID, err := strconv.Atoi(hardwareIDStr)
-	if err != nil || hardwareID <= 0 {
-		common.ApiErrorMsg(c, "invalid hardware_id parameter")
-		return
-	}
-
-	gpuCount := 1
-	if gpuCountStr != "" {
-		if parsed, err := strconv.Atoi(gpuCountStr); err == nil && parsed > 0 {
-			gpuCount = parsed
-		}
-	}
-
-	replicas, err := client.GetAvailableReplicas(hardwareID, gpuCount)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	common.ApiSuccess(c, replicas)
-}
-
-func GetPriceEstimation(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	var req ionet.PriceEstimationRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	priceResp, err := client.GetPriceEstimation(&req)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	common.ApiSuccess(c, priceResp)
-}
-
-func CheckClusterNameAvailability(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	clusterName := strings.TrimSpace(c.Query("name"))
-	if clusterName == "" {
-		common.ApiErrorMsg(c, "name parameter is required")
-		return
-	}
-
-	available, err := client.CheckClusterNameAvailability(clusterName)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	data := gin.H{
-		"available": available,
-		"name":      clusterName,
-	}
-	common.ApiSuccess(c, data)
-}
-
-func GetDeploymentLogs(c *gin.Context) {
-	client, ok := getIoClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	containerID := c.Query("container_id")
-	if containerID == "" {
-		common.ApiErrorMsg(c, "container_id parameter is required")
-		return
-	}
-	level := c.Query("level")
-	stream := c.Query("stream")
-	cursor := c.Query("cursor")
-	limitStr := c.Query("limit")
-	follow := c.Query("follow") == "true"
-
-	var limit int = 100
-	if limitStr != "" {
-		if parsedLimit, err := strconv.Atoi(limitStr); err == nil && parsedLimit > 0 {
-			limit = parsedLimit
-			if limit > 1000 {
-				limit = 1000
-			}
-		}
-	}
-
-	opts := &ionet.GetLogsOptions{
-		Level:  level,
-		Stream: stream,
-		Limit:  limit,
-		Cursor: cursor,
-		Follow: follow,
-	}
-
-	if startTime := c.Query("start_time"); startTime != "" {
-		if t, err := time.Parse(time.RFC3339, startTime); err == nil {
-			opts.StartTime = &t
-		}
-	}
-	if endTime := c.Query("end_time"); endTime != "" {
-		if t, err := time.Parse(time.RFC3339, endTime); err == nil {
-			opts.EndTime = &t
-		}
-	}
-
-	rawLogs, err := client.GetContainerLogsRaw(deploymentID, containerID, opts)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	common.ApiSuccess(c, rawLogs)
-}
-
-func ListDeploymentContainers(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	containers, err := client.ListContainers(deploymentID)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	items := make([]map[string]interface{}, 0)
-	if containers != nil {
-		items = make([]map[string]interface{}, 0, len(containers.Workers))
-		for _, ctr := range containers.Workers {
-			events := make([]map[string]interface{}, 0, len(ctr.ContainerEvents))
-			for _, event := range ctr.ContainerEvents {
-				events = append(events, map[string]interface{}{
-					"time":    event.Time.Unix(),
-					"message": event.Message,
-				})
-			}
-
-			items = append(items, map[string]interface{}{
-				"container_id":       ctr.ContainerID,
-				"device_id":          ctr.DeviceID,
-				"status":             strings.ToLower(strings.TrimSpace(ctr.Status)),
-				"hardware":           ctr.Hardware,
-				"brand_name":         ctr.BrandName,
-				"created_at":         ctr.CreatedAt.Unix(),
-				"uptime_percent":     ctr.UptimePercent,
-				"gpus_per_container": ctr.GPUsPerContainer,
-				"public_url":         ctr.PublicURL,
-				"events":             events,
-			})
-		}
-	}
-
-	response := gin.H{
-		"total":      0,
-		"containers": items,
-	}
-	if containers != nil {
-		response["total"] = containers.Total
-	}
-
-	common.ApiSuccess(c, response)
-}
-
-func GetContainerDetails(c *gin.Context) {
-	client, ok := getIoEnterpriseClient(c)
-	if !ok {
-		return
-	}
-
-	deploymentID, ok := requireDeploymentID(c)
-	if !ok {
-		return
-	}
-
-	containerID, ok := requireContainerID(c)
-	if !ok {
-		return
-	}
-
-	details, err := client.GetContainerDetails(deploymentID, containerID)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-	if details == nil {
-		common.ApiErrorMsg(c, "container details not found")
-		return
-	}
-
-	events := make([]map[string]interface{}, 0, len(details.ContainerEvents))
-	for _, event := range details.ContainerEvents {
-		events = append(events, map[string]interface{}{
-			"time":    event.Time.Unix(),
-			"message": event.Message,
-		})
-	}
-
-	data := gin.H{
-		"deployment_id":      deploymentID,
-		"container_id":       details.ContainerID,
-		"device_id":          details.DeviceID,
-		"status":             strings.ToLower(strings.TrimSpace(details.Status)),
-		"hardware":           details.Hardware,
-		"brand_name":         details.BrandName,
-		"created_at":         details.CreatedAt.Unix(),
-		"uptime_percent":     details.UptimePercent,
-		"gpus_per_container": details.GPUsPerContainer,
-		"public_url":         details.PublicURL,
-		"events":             events,
-	}
-
-	common.ApiSuccess(c, data)
-}
--- a/controller/discord.go
+++ b/controller/discord.go
@@ -114,7 +114,7 @@ func DiscordOAuth(c *gin.Context) {
 		DiscordBind(c)
 		return
 	}
-	if !system_setting.GetDiscordSettings().Enabled {
+		if !system_setting.GetDiscordSettings().Enabled {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": "管理员未开启通过 Discord 登录以及注册",
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -114,7 +114,6 @@ func GetStatus(c *gin.Context) {
 		"setup":                       constant.Setup,
 		"user_agreement_enabled":      legalSetting.UserAgreement != "",
 		"privacy_policy_enabled":      legalSetting.PrivacyPolicy != "",
-		"checkin_enabled":             operation_setting.GetCheckinSetting().Enabled,
 	}

 	// 根据启用状态注入可选内容
--- a/controller/model.go
+++ b/controller/model.go
@@ -18,7 +18,6 @@ import (
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/operation_setting"
 	"github.com/QuantumNous/new-api/setting/ratio_setting"
-	"github.com/QuantumNous/new-api/types"
 	"github.com/gin-gonic/gin"
 	"github.com/samber/lo"
 )
@@ -276,7 +275,7 @@ func RetrieveModel(c *gin.Context, modelType int) {
 			c.JSON(200, aiModel)
 		}
 	} else {
-		openAIError := types.OpenAIError{
+		openAIError := dto.OpenAIError{
 			Message: fmt.Sprintf("The model '%s' does not exist", modelId),
 			Type:    "invalid_request_error",
 			Param:   "model",
--- a/controller/model_sync.go
+++ b/controller/model_sync.go
@@ -249,9 +249,7 @@ func ensureVendorID(vendorName string, vendorByName map[string]upstreamVendor, v
 	return 0
 }

-// SyncUpstreamModels 同步上游模型与供应商：
-// - 默认仅创建「未配置模型」
-// - 可通过 overwrite 选择性覆盖更新本地已有模型的字段（前提：sync_official <> 0）
+// SyncUpstreamModels 同步上游模型与供应商，仅对「未配置模型」生效
 func SyncUpstreamModels(c *gin.Context) {
 	var req syncRequest
 	// 允许空体
@@ -262,26 +260,12 @@ func SyncUpstreamModels(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
 		return
 	}
-
-	// 若既无缺失模型需要创建，也未指定覆盖更新字段，则无需请求上游数据，直接返回
-	if len(missing) == 0 && len(req.Overwrite) == 0 {
-		modelsURL, vendorsURL := getUpstreamURLs(req.Locale)
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"data": gin.H{
-				"created_models":  0,
-				"created_vendors": 0,
-				"updated_models":  0,
-				"skipped_models":  []string{},
-				"created_list":    []string{},
-				"updated_list":    []string{},
-				"source": gin.H{
-					"locale":      req.Locale,
-					"models_url":  modelsURL,
-					"vendors_url": vendorsURL,
-				},
-			},
-		})
+	if len(missing) == 0 {
+		c.JSON(http.StatusOK, gin.H{"success": true, "data": gin.H{
+			"created_models":  0,
+			"created_vendors": 0,
+			"skipped_models":  []string{},
+		}})
 		return
 	}

@@ -331,9 +315,9 @@ func SyncUpstreamModels(c *gin.Context) {
 	createdModels := 0
 	createdVendors := 0
 	updatedModels := 0
-	skipped := make([]string, 0)
-	createdList := make([]string, 0)
-	updatedList := make([]string, 0)
+	var skipped []string
+	var createdList []string
+	var updatedList []string

 	// 本地缓存：vendorName -> id
 	vendorIDCache := make(map[string]int)
--- a/controller/option.go
+++ b/controller/option.go
@@ -20,11 +20,7 @@ func GetOptions(c *gin.Context) {
 	var options []*model.Option
 	common.OptionMapRWMutex.Lock()
 	for k, v := range common.OptionMap {
-		if strings.HasSuffix(k, "Token") ||
-			strings.HasSuffix(k, "Secret") ||
-			strings.HasSuffix(k, "Key") ||
-			strings.HasSuffix(k, "secret") ||
-			strings.HasSuffix(k, "api_key") {
+		if strings.HasSuffix(k, "Token") || strings.HasSuffix(k, "Secret") || strings.HasSuffix(k, "Key") {
 			continue
 		}
 		options = append(options, &model.Option{
--- a/controller/playground.go
+++ b/controller/playground.go
@@ -3,10 +3,12 @@ package controller
 import (
 	"errors"
 	"fmt"
+	"time"

+	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/middleware"
 	"github.com/QuantumNous/new-api/model"
-	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-gonic/gin"
@@ -29,11 +31,8 @@ func Playground(c *gin.Context) {
 		return
 	}

-	relayInfo, err := relaycommon.GenRelayInfo(c, types.RelayFormatOpenAI, nil, nil)
-	if err != nil {
-		newAPIError = types.NewError(err, types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
-		return
-	}
+	group := common.GetContextKeyString(c, constant.ContextKeyUsingGroup)
+	modelName := c.GetString("original_model")

 	userId := c.GetInt("id")

@@ -47,10 +46,16 @@ func Playground(c *gin.Context) {

 	tempToken := &model.Token{
 		UserId: userId,
-		Name:   fmt.Sprintf("playground-%s", relayInfo.UsingGroup),
-		Group:  relayInfo.UsingGroup,
+		Name:   fmt.Sprintf("playground-%s", group),
+		Group:  group,
 	}
 	_ = middleware.SetupContextForToken(c, tempToken)
+	_, newAPIError = getChannel(c, group, modelName, 0)
+	if newAPIError != nil {
+		return
+	}
+	//middleware.SetupContextForSelectedChannel(c, channel, playgroundRequest.Model)
+	common.SetContextKey(c, constant.ContextKeyRequestStartTime, time.Now())

 	Relay(c, types.RelayFormatOpenAI)
 }
--- a/controller/relay.go
+++ b/controller/relay.go
@@ -2,7 +2,6 @@ package controller

 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -65,8 +64,8 @@ func geminiRelayHandler(c *gin.Context, info *relaycommon.RelayInfo) *types.NewA
 func Relay(c *gin.Context, relayFormat types.RelayFormat) {

 	requestId := c.GetString(common.RequestIdKey)
-	//group := common.GetContextKeyString(c, constant.ContextKeyUsingGroup)
-	//originalModel := common.GetContextKeyString(c, constant.ContextKeyOriginalModel)
+	group := common.GetContextKeyString(c, constant.ContextKeyUsingGroup)
+	originalModel := common.GetContextKeyString(c, constant.ContextKeyOriginalModel)

 	var (
 		newAPIError *types.NewAPIError
@@ -105,12 +104,7 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {

 	request, err := helper.GetAndValidateRequest(c, relayFormat)
 	if err != nil {
-		// Map "request body too large" to 413 so clients can handle it correctly
-		if common.IsRequestBodyTooLargeError(err) || errors.Is(err, common.ErrRequestBodyTooLarge) {
-			newAPIError = types.NewErrorWithStatusCode(err, types.ErrorCodeReadRequestBodyFailed, http.StatusRequestEntityTooLarge, types.ErrOptionWithSkipRetry())
-		} else {
-			newAPIError = types.NewError(err, types.ErrorCodeInvalidRequest)
-		}
+		newAPIError = types.NewError(err, types.ErrorCodeInvalidRequest)
 		return
 	}

@@ -120,17 +114,9 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		return
 	}

-	needSensitiveCheck := setting.ShouldCheckPromptSensitive()
-	needCountToken := constant.CountToken
-	// Avoid building huge CombineText (strings.Join) when token counting and sensitive check are both disabled.
-	var meta *types.TokenCountMeta
-	if needSensitiveCheck || needCountToken {
-		meta = request.GetTokenCountMeta()
-	} else {
-		meta = fastTokenCountMetaForPricing(request)
-	}
+	meta := request.GetTokenCountMeta()

-	if needSensitiveCheck && meta != nil {
+	if setting.ShouldCheckPromptSensitive() {
 		contains, words := service.CheckSensitiveText(meta.CombineText)
 		if contains {
 			logger.LogWarn(c, fmt.Sprintf("user sensitive words detected: %s", strings.Join(words, ", ")))
@@ -139,13 +125,13 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		}
 	}

-	tokens, err := service.EstimateRequestToken(c, meta, relayInfo)
+	tokens, err := service.CountRequestToken(c, meta, relayInfo)
 	if err != nil {
 		newAPIError = types.NewError(err, types.ErrorCodeCountTokenFailed)
 		return
 	}

-	relayInfo.SetEstimatePromptTokens(tokens)
+	relayInfo.SetPromptTokens(tokens)

 	priceData, err := helper.ModelPriceHelper(c, relayInfo, tokens, meta)
 	if err != nil {
@@ -171,32 +157,16 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 		}
 	}()

-	retryParam := &service.RetryParam{
-		Ctx:        c,
-		TokenGroup: relayInfo.TokenGroup,
-		ModelName:  relayInfo.OriginModelName,
-		Retry:      common.GetPointer(0),
-	}
-
-	for ; retryParam.GetRetry() <= common.RetryTimes; retryParam.IncreaseRetry() {
-		channel, channelErr := getChannel(c, relayInfo, retryParam)
-		if channelErr != nil {
-			logger.LogError(c, channelErr.Error())
-			newAPIError = channelErr
+	for i := 0; i <= common.RetryTimes; i++ {
+		channel, err := getChannel(c, group, originalModel, i)
+		if err != nil {
+			logger.LogError(c, err.Error())
+			newAPIError = err
 			break
 		}

 		addUsedChannel(c, channel.Id)
-		requestBody, bodyErr := common.GetRequestBody(c)
-		if bodyErr != nil {
-			// Ensure consistent 413 for oversized bodies even when error occurs later (e.g., retry path)
-			if common.IsRequestBodyTooLargeError(bodyErr) || errors.Is(bodyErr, common.ErrRequestBodyTooLarge) {
-				newAPIError = types.NewErrorWithStatusCode(bodyErr, types.ErrorCodeReadRequestBodyFailed, http.StatusRequestEntityTooLarge, types.ErrOptionWithSkipRetry())
-			} else {
-				newAPIError = types.NewErrorWithStatusCode(bodyErr, types.ErrorCodeReadRequestBodyFailed, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
-			}
-			break
-		}
+		requestBody, _ := common.GetRequestBody(c)
 		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))

 		switch relayFormat {
@@ -216,7 +186,7 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {

 		processChannelError(c, *types.NewChannelError(channel.Id, channel.Type, channel.Name, channel.ChannelInfo.IsMultiKey, common.GetContextKeyString(c, constant.ContextKeyChannelKey), channel.GetAutoBan()), newAPIError)

-		if !shouldRetry(c, newAPIError, common.RetryTimes-retryParam.GetRetry()) {
+		if !shouldRetry(c, newAPIError, common.RetryTimes-i) {
 			break
 		}
 	}
@@ -241,35 +211,8 @@ func addUsedChannel(c *gin.Context, channelId int) {
 	c.Set("use_channel", useChannel)
 }

-func fastTokenCountMetaForPricing(request dto.Request) *types.TokenCountMeta {
-	if request == nil {
-		return &types.TokenCountMeta{}
-	}
-	meta := &types.TokenCountMeta{
-		TokenType: types.TokenTypeTokenizer,
-	}
-	switch r := request.(type) {
-	case *dto.GeneralOpenAIRequest:
-		if r.MaxCompletionTokens > r.MaxTokens {
-			meta.MaxTokens = int(r.MaxCompletionTokens)
-		} else {
-			meta.MaxTokens = int(r.MaxTokens)
-		}
-	case *dto.OpenAIResponsesRequest:
-		meta.MaxTokens = int(r.MaxOutputTokens)
-	case *dto.ClaudeRequest:
-		meta.MaxTokens = int(r.MaxTokens)
-	case *dto.ImageRequest:
-		// Pricing for image requests depends on ImagePriceRatio; safe to compute even when CountToken is disabled.
-		return r.GetTokenCountMeta()
-	default:
-		// Best-effort: leave CombineText empty to avoid large allocations.
-	}
-	return meta
-}
-
-func getChannel(c *gin.Context, info *relaycommon.RelayInfo, retryParam *service.RetryParam) (*model.Channel, *types.NewAPIError) {
-	if info.ChannelMeta == nil {
+func getChannel(c *gin.Context, group, originalModel string, retryCount int) (*model.Channel, *types.NewAPIError) {
+	if retryCount == 0 {
 		autoBan := c.GetBool("auto_ban")
 		autoBanInt := 1
 		if !autoBan {
@@ -282,18 +225,14 @@ func getChannel(c *gin.Context, info *relaycommon.RelayInfo, retryParam *service
 			AutoBan: &autoBanInt,
 		}, nil
 	}
-	channel, selectGroup, err := service.CacheGetRandomSatisfiedChannel(retryParam)
-
-	info.PriceData.GroupRatioInfo = helper.HandleGroupRatio(c, info)
-
+	channel, selectGroup, err := service.CacheGetRandomSatisfiedChannel(c, group, originalModel, retryCount)
 	if err != nil {
-		return nil, types.NewError(fmt.Errorf("获取分组 %s 下模型 %s 的可用渠道失败（retry）: %s", selectGroup, info.OriginModelName, err.Error()), types.ErrorCodeGetChannelFailed, types.ErrOptionWithSkipRetry())
+		return nil, types.NewError(fmt.Errorf("获取分组 %s 下模型 %s 的可用渠道失败（retry）: %s", selectGroup, originalModel, err.Error()), types.ErrorCodeGetChannelFailed, types.ErrOptionWithSkipRetry())
 	}
 	if channel == nil {
-		return nil, types.NewError(fmt.Errorf("分组 %s 下模型 %s 的可用渠道不存在（retry）", selectGroup, info.OriginModelName), types.ErrorCodeGetChannelFailed, types.ErrOptionWithSkipRetry())
+		return nil, types.NewError(fmt.Errorf("分组 %s 下模型 %s 的可用渠道不存在（retry）", selectGroup, originalModel), types.ErrorCodeGetChannelFailed, types.ErrOptionWithSkipRetry())
 	}
-
-	newAPIError := middleware.SetupContextForSelectedChannel(c, channel, info.OriginModelName)
+	newAPIError := middleware.SetupContextForSelectedChannel(c, channel, originalModel)
 	if newAPIError != nil {
 		return nil, newAPIError
 	}
@@ -346,7 +285,7 @@ func processChannelError(c *gin.Context, channelError types.ChannelError, err *t
 	logger.LogError(c, fmt.Sprintf("channel error (channel #%d, status code: %d): %s", channelError.ChannelId, err.StatusCode, err.Error()))
 	// 不要使用context获取渠道信息，异步处理时可能会出现渠道信息不一致的情况
 	// do not use context to get channel info, there may be inconsistent channel info when processing asynchronously
-	if service.ShouldDisableChannel(channelError.ChannelType, err) && channelError.AutoBan {
+	if service.ShouldDisableChannel(channelError.ChannelId, err) && channelError.AutoBan {
 		gopool.Go(func() {
 			service.DisableChannel(channelError, err.Error())
 		})
@@ -427,7 +366,7 @@ func RelayMidjourney(c *gin.Context) {
 }

 func RelayNotImplemented(c *gin.Context) {
-	err := types.OpenAIError{
+	err := dto.OpenAIError{
 		Message: "API not implemented",
 		Type:    "new_api_error",
 		Param:   "",
@@ -439,7 +378,7 @@ func RelayNotImplemented(c *gin.Context) {
 }

 func RelayNotFound(c *gin.Context) {
-	err := types.OpenAIError{
+	err := dto.OpenAIError{
 		Message: fmt.Sprintf("Invalid URL (%s %s)", c.Request.Method, c.Request.URL.Path),
 		Type:    "invalid_request_error",
 		Param:   "",
@@ -453,6 +392,8 @@ func RelayNotFound(c *gin.Context) {
 func RelayTask(c *gin.Context) {
 	retryTimes := common.RetryTimes
 	channelId := c.GetInt("channel_id")
+	group := c.GetString("group")
+	originalModel := c.GetString("original_model")
 	c.Set("use_channel", []string{fmt.Sprintf("%d", channelId)})
 	relayInfo, err := relaycommon.GenRelayInfo(c, types.RelayFormatTask, nil, nil)
 	if err != nil {
@@ -462,14 +403,8 @@ func RelayTask(c *gin.Context) {
 	if taskErr == nil {
 		retryTimes = 0
 	}
-	retryParam := &service.RetryParam{
-		Ctx:        c,
-		TokenGroup: relayInfo.TokenGroup,
-		ModelName:  relayInfo.OriginModelName,
-		Retry:      common.GetPointer(0),
-	}
-	for ; shouldRetryTaskRelay(c, channelId, taskErr, retryTimes) && retryParam.GetRetry() < retryTimes; retryParam.IncreaseRetry() {
-		channel, newAPIError := getChannel(c, relayInfo, retryParam)
+	for i := 0; shouldRetryTaskRelay(c, channelId, taskErr, retryTimes) && i < retryTimes; i++ {
+		channel, newAPIError := getChannel(c, group, originalModel, i)
 		if newAPIError != nil {
 			logger.LogError(c, fmt.Sprintf("CacheGetRandomSatisfiedChannel failed: %s", newAPIError.Error()))
 			taskErr = service.TaskErrorWrapperLocal(newAPIError.Err, "get_channel_failed", http.StatusInternalServerError)
@@ -479,18 +414,10 @@ func RelayTask(c *gin.Context) {
 		useChannel := c.GetStringSlice("use_channel")
 		useChannel = append(useChannel, fmt.Sprintf("%d", channelId))
 		c.Set("use_channel", useChannel)
-		logger.LogInfo(c, fmt.Sprintf("using channel #%d to retry (remain times %d)", channel.Id, retryParam.GetRetry()))
+		logger.LogInfo(c, fmt.Sprintf("using channel #%d to retry (remain times %d)", channel.Id, i))
 		//middleware.SetupContextForSelectedChannel(c, channel, originalModel)

-		requestBody, err := common.GetRequestBody(c)
-		if err != nil {
-			if common.IsRequestBodyTooLargeError(err) || errors.Is(err, common.ErrRequestBodyTooLarge) {
-				taskErr = service.TaskErrorWrapperLocal(err, "read_request_body_failed", http.StatusRequestEntityTooLarge)
-			} else {
-				taskErr = service.TaskErrorWrapperLocal(err, "read_request_body_failed", http.StatusBadRequest)
-			}
-			break
-		}
+		requestBody, _ := common.GetRequestBody(c)
 		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
 		taskErr = taskRelayHandler(c, relayInfo)
 	}
--- a/controller/task.go
+++ b/controller/task.go
@@ -29,7 +29,7 @@ func UpdateTaskBulk() {
 		time.Sleep(time.Duration(15) * time.Second)
 		common.SysLog("任务进度轮询开始")
 		ctx := context.TODO()
-		allTasks := model.GetAllUnFinishSyncTasks(constant.TaskQueryLimit)
+		allTasks := model.GetAllUnFinishSyncTasks(500)
 		platformTask := make(map[constant.TaskPlatform][]*model.Task)
 		for _, t := range allTasks {
 			platformTask[t.Platform] = append(platformTask[t.Platform], t)
@@ -88,7 +88,7 @@ func UpdateSunoTaskAll(ctx context.Context, taskChannelM map[int][]string, taskM
 	for channelId, taskIds := range taskChannelM {
 		err := updateSunoTaskAll(ctx, channelId, taskIds, taskM)
 		if err != nil {
-			logger.LogError(ctx, fmt.Sprintf("渠道 #%d 更新异步任务失败: %s", channelId, err.Error()))
+			logger.LogError(ctx, fmt.Sprintf("渠道 #%d 更新异步任务失败: %d", channelId, err.Error()))
 		}
 	}
 	return nil
@@ -116,10 +116,9 @@ func updateSunoTaskAll(ctx context.Context, channelId int, taskIds []string, tas
 	if adaptor == nil {
 		return errors.New("adaptor not found")
 	}
-	proxy := channel.GetSetting().Proxy
 	resp, err := adaptor.FetchTask(*channel.BaseURL, channel.Key, map[string]any{
 		"ids": taskIds,
-	}, proxy)
+	})
 	if err != nil {
 		common.SysLog(fmt.Sprintf("Get Task Do req error: %v", err))
 		return err
@@ -141,7 +140,7 @@ func updateSunoTaskAll(ctx context.Context, channelId int, taskIds []string, tas
 		return err
 	}
 	if !responseItems.IsSuccess() {
-		common.SysLog(fmt.Sprintf("渠道 #%d 未完成的任务有: %d, 成功获取到任务数: %s", channelId, len(taskIds), string(responseBody)))
+		common.SysLog(fmt.Sprintf("渠道 #%d 未完成的任务有: %d, 成功获取到任务数: %d", channelId, len(taskIds), string(responseBody)))
 		return err
 	}

--- a/controller/task_video.go
+++ b/controller/task_video.go
@@ -67,23 +67,16 @@ func updateVideoSingleTask(ctx context.Context, adaptor channel.TaskAdaptor, cha
 	if channel.GetBaseURL() != "" {
 		baseURL = channel.GetBaseURL()
 	}
-	proxy := channel.GetSetting().Proxy

 	task := taskM[taskId]
 	if task == nil {
 		logger.LogError(ctx, fmt.Sprintf("Task %s not found in taskM", taskId))
 		return fmt.Errorf("task %s not found", taskId)
 	}
-	key := channel.Key
-
-	privateData := task.PrivateData
-	if privateData.Key != "" {
-		key = privateData.Key
-	}
-	resp, err := adaptor.FetchTask(baseURL, key, map[string]any{
+	resp, err := adaptor.FetchTask(baseURL, channel.Key, map[string]any{
 		"task_id": taskId,
 		"action":  task.Action,
-	}, proxy)
+	})
 	if err != nil {
 		return fmt.Errorf("fetchTask failed for task %s: %w", taskId, err)
 	}
--- a/controller/token.go
+++ b/controller/token.go
@@ -1,7 +1,6 @@
 package controller

 import (
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -143,31 +142,13 @@ func AddToken(c *gin.Context) {
 		common.ApiError(c, err)
 		return
 	}
-	if len(token.Name) > 50 {
+	if len(token.Name) > 30 {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": "令牌名称过长",
 		})
 		return
 	}
-	// 非无限额度时，检查额度值是否超出有效范围
-	if !token.UnlimitedQuota {
-		if token.RemainQuota < 0 {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "额度值不能为负数",
-			})
-			return
-		}
-		maxQuotaValue := int((1000000000 * common.QuotaPerUnit))
-		if token.RemainQuota > maxQuotaValue {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("额度值超出有效范围，最大值为 %d", maxQuotaValue),
-			})
-			return
-		}
-	}
 	key, err := common.GenerateKey()
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -190,7 +171,6 @@ func AddToken(c *gin.Context) {
 		ModelLimits:        token.ModelLimits,
 		AllowIps:           token.AllowIps,
 		Group:              token.Group,
-		CrossGroupRetry:    token.CrossGroupRetry,
 	}
 	err = cleanToken.Insert()
 	if err != nil {
@@ -228,30 +208,13 @@ func UpdateToken(c *gin.Context) {
 		common.ApiError(c, err)
 		return
 	}
-	if len(token.Name) > 50 {
+	if len(token.Name) > 30 {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": "令牌名称过长",
 		})
 		return
 	}
-	if !token.UnlimitedQuota {
-		if token.RemainQuota < 0 {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "额度值不能为负数",
-			})
-			return
-		}
-		maxQuotaValue := int((1000000000 * common.QuotaPerUnit))
-		if token.RemainQuota > maxQuotaValue {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("额度值超出有效范围，最大值为 %d", maxQuotaValue),
-			})
-			return
-		}
-	}
 	cleanToken, err := model.GetTokenByIds(token.Id, userId)
 	if err != nil {
 		common.ApiError(c, err)
@@ -285,7 +248,6 @@ func UpdateToken(c *gin.Context) {
 		cleanToken.ModelLimits = token.ModelLimits
 		cleanToken.AllowIps = token.AllowIps
 		cleanToken.Group = token.Group
-		cleanToken.CrossGroupRetry = token.CrossGroupRetry
 	}
 	err = cleanToken.Update()
 	if err != nil {
@@ -297,6 +259,7 @@ func UpdateToken(c *gin.Context) {
 		"message": "",
 		"data":    cleanToken,
 	})
+	return
 }

 type TokenBatch struct {
--- a/controller/topup_creem.go
+++ b/controller/topup_creem.go
@@ -7,12 +7,12 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/setting"
 	"io"
 	"log"
 	"net/http"
+	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/model"
+	"github.com/QuantumNous/new-api/setting"
 	"time"

 	"github.com/gin-gonic/gin"
--- a/controller/user.go
+++ b/controller/user.go
@@ -110,17 +110,18 @@ func setupLogin(user *model.User, c *gin.Context) {
 		})
 		return
 	}
+	cleanUser := model.User{
+		Id:          user.Id,
+		Username:    user.Username,
+		DisplayName: user.DisplayName,
+		Role:        user.Role,
+		Status:      user.Status,
+		Group:       user.Group,
+	}
 	c.JSON(http.StatusOK, gin.H{
 		"message": "",
 		"success": true,
-		"data": map[string]any{
-			"id":           user.Id,
-			"username":     user.Username,
-			"display_name": user.DisplayName,
-			"role":         user.Role,
-			"status":       user.Status,
-			"group":        user.Group,
-		},
+		"data":    cleanUser,
 	})
 }

@@ -763,10 +764,7 @@ func checkUpdatePassword(originalPassword string, newPassword string, userId int
 	if err != nil {
 		return
 	}
-
-	// 密码不为空,需要验证原密码
-	// 支持第一次账号绑定时原密码为空的情况
-	if !common.ValidatePasswordAndHash(originalPassword, currentUser.Password) && currentUser.Password != "" {
+	if !common.ValidatePasswordAndHash(originalPassword, currentUser.Password) {
 		err = fmt.Errorf("原密码错误")
 		return
 	}
--- a/controller/video_proxy.go
+++ b/controller/video_proxy.go
@@ -1,7 +1,6 @@
 package controller

 import (
-	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -11,7 +10,6 @@ import (
 	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/logger"
 	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/service"

 	"github.com/gin-gonic/gin"
 )
@@ -77,22 +75,11 @@ func VideoProxy(c *gin.Context) {
 	}

 	var videoURL string
-	proxy := channel.GetSetting().Proxy
-	client, err := service.GetHttpClientWithProxy(proxy)
-	if err != nil {
-		logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to create proxy client for task %s: %s", taskID, err.Error()))
-		c.JSON(http.StatusInternalServerError, gin.H{
-			"error": gin.H{
-				"message": "Failed to create proxy client",
-				"type":    "server_error",
-			},
-		})
-		return
+	client := &http.Client{
+		Timeout: 60 * time.Second,
 	}

-	ctx, cancel := context.WithTimeout(c.Request.Context(), 60*time.Second)
-	defer cancel()
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "", nil)
+	req, err := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, "", nil)
 	if err != nil {
 		logger.LogError(c.Request.Context(), fmt.Sprintf("Failed to create request: %s", err.Error()))
 		c.JSON(http.StatusInternalServerError, gin.H{
@@ -130,12 +117,13 @@ func VideoProxy(c *gin.Context) {
 			return
 		}
 		req.Header.Set("x-goog-api-key", apiKey)
-	case constant.ChannelTypeOpenAI, constant.ChannelTypeSora:
-		videoURL = fmt.Sprintf("%s/v1/videos/%s/content", baseURL, task.TaskID)
-		req.Header.Set("Authorization", "Bearer "+channel.Key)
-	default:
+	case constant.ChannelTypeAli:
 		// Video URL is directly in task.FailReason
 		videoURL = task.FailReason
+	default:
+		// Default (Sora, etc.): Use original logic
+		videoURL = fmt.Sprintf("%s/v1/videos/%s/content", baseURL, task.TaskID)
+		req.Header.Set("Authorization", "Bearer "+channel.Key)
 	}

 	req.URL, err = url.Parse(videoURL)
--- a/controller/video_proxy_gemini.go
+++ b/controller/video_proxy_gemini.go
@@ -35,11 +35,10 @@ func getGeminiVideoURL(channel *model.Channel, task *model.Task, apiKey string)
 		return "", fmt.Errorf("api key not available for task")
 	}

-	proxy := channel.GetSetting().Proxy
 	resp, err := adaptor.FetchTask(baseURL, apiKey, map[string]any{
 		"task_id": task.TaskID,
 		"action":  task.Action,
-	}, proxy)
+	})
 	if err != nil {
 		return "", fmt.Errorf("fetch task failed: %w", err)
 	}
--- a/docs/api/api_auth.md
+++ b/docs/api/api_auth.md
@@ -0,0 +1,53 @@
+# API 鉴权文档
+
+## 认证方式
+
+### Access Token
+
+对于需要鉴权的 API 接口，必须同时提供以下两个请求头来进行 Access Token 认证：
+
+1. **请求头中的 `Authorization` 字段**
+
+    将 Access Token 放置于 HTTP 请求头部的 `Authorization` 字段中，格式如下：
+
+    ```
+    Authorization: <your_access_token>
+    ```
+
+    其中 `<your_access_token>` 需要替换为实际的 Access Token 值。
+
+2. **请求头中的 `New-Api-User` 字段**
+
+    将用户 ID 放置于 HTTP 请求头部的 `New-Api-User` 字段中，格式如下：
+
+    ```
+    New-Api-User: <your_user_id>
+    ```
+
+    其中 `<your_user_id>` 需要替换为实际的用户 ID。
+
+**注意：**
+
+*   **必须同时提供 `Authorization` 和 `New-Api-User` 两个请求头才能通过鉴权。**
+*   如果只提供其中一个请求头，或者两个请求头都未提供，则会返回 `401 Unauthorized` 错误。
+*   如果 `Authorization` 中的 Access Token 无效，则会返回 `401 Unauthorized` 错误，并提示“无权进行此操作，access token 无效”。
+*   如果 `New-Api-User` 中的用户 ID 与 Access Token 不匹配，则会返回 `401 Unauthorized` 错误，并提示“无权进行此操作，与登录用户不匹配，请重新登录”。
+*   如果没有提供 `New-Api-User` 请求头，则会返回 `401 Unauthorized` 错误，并提示“无权进行此操作，未提供 New-Api-User”。
+*   如果 `New-Api-User` 请求头格式错误，则会返回 `401 Unauthorized` 错误，并提示“无权进行此操作，New-Api-User 格式错误”。
+*   如果用户已被禁用，则会返回 `403 Forbidden` 错误，并提示“用户已被封禁”。
+*   如果用户权限不足，则会返回 `403 Forbidden` 错误，并提示“无权进行此操作，权限不足”。
+*   如果用户信息无效，则会返回 `403 Forbidden` 错误，并提示“无权进行此操作，用户信息无效”。
+
+## Curl 示例
+
+假设您的 Access Token 为 `access_token`，用户 ID 为 `123`，要访问的 API 接口为 `/api/user/self`，则可以使用以下 curl 命令：
+
+```bash
+curl -X GET \
+  -H "Authorization: access_token" \
+  -H "New-Api-User: 123" \
+  https://your-domain.com/api/user/self
+```
+
+请将 `access_token`、`123` 和 `https://your-domain.com` 替换为实际的值。
+
--- a/docs/api/web_api.md
+++ b/docs/api/web_api.md
@@ -0,0 +1,198 @@
+# New API – Web 界面后端接口文档
+
+> 本文档汇总了 **New API** 后端提供给前端 Web 界面的全部 REST 接口（不含 *Relay* 相关接口）。
+>
+> 接口前缀统一为 `https://<your-domain>`，以下仅列出 **路径**、**HTTP 方法**、**鉴权要求** 与 **功能简介**。
+>
+> 鉴权级别说明：
+> * **公开** – 不需要登录即可调用
+> * **用户** – 需携带用户 Token（`middleware.UserAuth`）
+> * **管理员** – 需管理员 Token（`middleware.AdminAuth`）
+> * **Root** – 仅限最高权限 Root 用户（`middleware.RootAuth`）
+
+---
+
+## 1. 初始化 / 系统状态
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET  | /api/setup | 公开 | 获取系统初始化状态 |
+| POST | /api/setup | 公开 | 完成首次安装向导 |
+| GET  | /api/status | 公开 | 获取运行状态摘要 |
+| GET  | /api/uptime/status | 公开 | Uptime-Kuma 兼容状态探针 |
+| GET  | /api/status/test | 管理员 | 测试后端与依赖组件是否正常 |
+
+## 2. 公共信息
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/models | 用户 | 获取前端可用模型列表 |
+| GET | /api/notice | 公开 | 获取公告栏内容 |
+| GET | /api/about | 公开 | 关于页面信息 |
+| GET | /api/home_page_content | 公开 | 首页自定义内容 |
+| GET | /api/pricing | 可匿名/用户 | 价格与套餐信息 |
+| GET | /api/ratio_config | 公开 | 模型倍率配置（仅公开字段） |
+
+## 3. 邮件 / 身份验证
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/verification | 公开 (限流) | 发送邮箱验证邮件 |
+| GET | /api/reset_password | 公开 (限流) | 发送重置密码邮件 |
+| POST | /api/user/reset | 公开 | 提交重置密码请求 |
+
+## 4. OAuth / 第三方登录
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/oauth/github | 公开 | GitHub OAuth 跳转 |
+| GET | /api/oauth/discord | 公开 | Discord 通用 OAuth 跳转 |
+| GET | /api/oauth/oidc | 公开 | OIDC 通用 OAuth 跳转 |
+| GET | /api/oauth/linuxdo | 公开 | LinuxDo OAuth 跳转 |
+| GET | /api/oauth/wechat | 公开 | 微信扫码登录跳转 |
+| GET | /api/oauth/wechat/bind | 公开 | 微信账户绑定 |
+| GET | /api/oauth/email/bind | 公开 | 邮箱绑定 |
+| GET | /api/oauth/telegram/login | 公开 | Telegram 登录 |
+| GET | /api/oauth/telegram/bind | 公开 | Telegram 账户绑定 |
+| GET | /api/oauth/state | 公开 | 获取随机 state（防 CSRF） |
+
+## 5. 用户模块
+### 5.1 账号注册/登录
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| POST | /api/user/register | 公开 | 注册新账号 |
+| POST | /api/user/login | 公开 | 用户登录 |
+| GET  | /api/user/logout | 用户 | 退出登录 |
+| GET  | /api/user/epay/notify | 公开 | Epay 支付回调 |
+| GET  | /api/user/groups | 公开 | 列出所有分组（无鉴权版） |
+
+### 5.2 用户自身操作 (需登录)
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/user/self/groups | 用户 | 获取自己所在分组 |
+| GET | /api/user/self | 用户 | 获取个人资料 |
+| GET | /api/user/models | 用户 | 获取模型可见性 |
+| PUT | /api/user/self | 用户 | 修改个人资料 |
+| DELETE | /api/user/self | 用户 | 注销账号 |
+| GET | /api/user/token | 用户 | 生成用户级别 Access Token |
+| GET | /api/user/aff | 用户 | 获取推广码信息 |
+| POST | /api/user/topup | 用户 | 余额直充 |
+| POST | /api/user/pay | 用户 | 提交支付订单 |
+| POST | /api/user/amount | 用户 | 余额支付 |
+| POST | /api/user/aff_transfer | 用户 | 推广额度转账 |
+| PUT | /api/user/setting | 用户 | 更新用户设置 |
+
+### 5.3 管理员用户管理
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/user/ | 管理员 | 获取全部用户列表 |
+| GET | /api/user/search | 管理员 | 搜索用户 |
+| GET | /api/user/:id | 管理员 | 获取单个用户信息 |
+| POST | /api/user/ | 管理员 | 创建用户 |
+| POST | /api/user/manage | 管理员 | 冻结/重置等管理操作 |
+| PUT | /api/user/ | 管理员 | 更新用户 |
+| DELETE | /api/user/:id | 管理员 | 删除用户 |
+
+## 6. 站点选项 (Root)
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/option/ | Root | 获取全局配置 |
+| PUT | /api/option/ | Root | 更新全局配置 |
+| POST | /api/option/rest_model_ratio | Root | 重置模型倍率 |
+| POST | /api/option/migrate_console_setting | Root | 迁移旧版控制台配置 |
+
+## 7. 模型倍率同步 (Root)
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/ratio_sync/channels | Root | 获取可同步渠道列表 |
+| POST | /api/ratio_sync/fetch | Root | 从上游拉取倍率 |
+
+## 8. 渠道管理 (管理员)
+| 方法 | 路径 | 说明 |
+|------|------|------|
+| GET | /api/channel/ | 获取渠道列表 |
+| GET | /api/channel/search | 搜索渠道 |
+| GET | /api/channel/models | 查询渠道模型能力 |
+| GET | /api/channel/models_enabled | 查询启用模型能力 |
+| GET | /api/channel/:id | 获取单个渠道 |
+| GET | /api/channel/test | 批量测试渠道连通性 |
+| GET | /api/channel/test/:id | 单个渠道测试 |
+| GET | /api/channel/update_balance | 批量刷新余额 |
+| GET | /api/channel/update_balance/:id | 单个刷新余额 |
+| POST | /api/channel/ | 新增渠道 |
+| PUT | /api/channel/ | 更新渠道 |
+| DELETE | /api/channel/disabled | 删除已禁用渠道 |
+| POST | /api/channel/tag/disabled | 批量禁用标签渠道 |
+| POST | /api/channel/tag/enabled | 批量启用标签渠道 |
+| PUT | /api/channel/tag | 编辑渠道标签 |
+| DELETE | /api/channel/:id | 删除渠道 |
+| POST | /api/channel/batch | 批量删除渠道 |
+| POST | /api/channel/fix | 修复渠道能力表 |
+| GET | /api/channel/fetch_models/:id | 拉取单渠道模型 |
+| POST | /api/channel/fetch_models | 拉取全部渠道模型 |
+| POST | /api/channel/batch/tag | 批量设置渠道标签 |
+| GET | /api/channel/tag/models | 根据标签获取模型 |
+| POST | /api/channel/copy/:id | 复制渠道 |
+
+## 9. Token 管理
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/token/ | 用户 | 获取全部 Token |
+| GET | /api/token/search | 用户 | 搜索 Token |
+| GET | /api/token/:id | 用户 | 获取单个 Token |
+| POST | /api/token/ | 用户 | 创建 Token |
+| PUT | /api/token/ | 用户 | 更新 Token |
+| DELETE | /api/token/:id | 用户 | 删除 Token |
+| POST | /api/token/batch | 用户 | 批量删除 Token |
+
+## 10. 兑换码管理 (管理员)
+| 方法 | 路径 | 说明 |
+|------|------|------|
+| GET | /api/redemption/ | 获取兑换码列表 |
+| GET | /api/redemption/search | 搜索兑换码 |
+| GET | /api/redemption/:id | 获取单个兑换码 |
+| POST | /api/redemption/ | 创建兑换码 |
+| PUT | /api/redemption/ | 更新兑换码 |
+| DELETE | /api/redemption/invalid | 删除无效兑换码 |
+| DELETE | /api/redemption/:id | 删除兑换码 |
+
+## 11. 日志
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/log/ | 管理员 | 获取全部日志 |
+| DELETE | /api/log/ | 管理员 | 删除历史日志 |
+| GET | /api/log/stat | 管理员 | 日志统计 |
+| GET | /api/log/self/stat | 用户 | 我的日志统计 |
+| GET | /api/log/search | 管理员 | 搜索全部日志 |
+| GET | /api/log/self | 用户 | 获取我的日志 |
+| GET | /api/log/self/search | 用户 | 搜索我的日志 |
+| GET | /api/log/token | 公开 | 根据 Token 查询日志（支持 CORS） |
+
+## 12. 数据统计
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/data/ | 管理员 | 全站用量按日期统计 |
+| GET | /api/data/self | 用户 | 我的用量按日期统计 |
+
+## 13. 分组
+| GET | /api/group/ | 管理员 | 获取全部分组列表 |
+
+## 14. Midjourney 任务
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/mj/self | 用户 | 获取自己的 MJ 任务 |
+| GET | /api/mj/ | 管理员 | 获取全部 MJ 任务 |
+
+## 15. 任务中心
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /api/task/self | 用户 | 获取我的任务 |
+| GET | /api/task/ | 管理员 | 获取全部任务 |
+
+## 16. 账户计费面板 (Dashboard)
+| 方法 | 路径 | 鉴权 | 说明 |
+|------|------|------|------|
+| GET | /dashboard/billing/subscription | 用户 Token | 获取订阅额度信息 |
+| GET | /v1/dashboard/billing/subscription | 同上 | 兼容 OpenAI SDK 路径 |
+| GET | /dashboard/billing/usage | 用户 Token | 获取使用量信息 |
+| GET | /v1/dashboard/billing/usage | 同上 | 兼容 OpenAI SDK 路径 |
+
+---
+
+> **更新日期**：2025.07.17
--- a/docs/ionet-client.md
+++ b/docs/ionet-client.md
@@ -1,7 +0,0 @@
-Request URL
-https://api.io.solutions/v1/io-cloud/clusters/654fc0a9-0d4a-4db4-9b95-3f56189348a2/update-name
-Request Method
-PUT
-
-{"status":"succeeded","message":"Cluster name updated successfully"}
-
--- a/docs/models/Midjourney.md
+++ b/docs/models/Midjourney.md
@@ -0,0 +1,82 @@
+# Midjourney Proxy API文档
+
+**简介**:Midjourney Proxy API文档
+
+## 接口列表
+支持的接口如下：
+ [x] /mj/submit/imagine
+ [x] /mj/submit/change
+ [x] /mj/submit/blend
+ [x] /mj/submit/describe
+ [x] /mj/image/{id} （通过此接口获取图片，**请必须在系统设置中填写服务器地址！！**）
+ [x] /mj/task/{id}/fetch （此接口返回的图片地址为经过One API转发的地址）
+ [x] /task/list-by-condition
+ [x] /mj/submit/action （仅midjourney-proxy-plus支持，下同）
+ [x] /mj/submit/modal
+ [x] /mj/submit/shorten
+ [x] /mj/task/{id}/image-seed
+ [x] /mj/insight-face/swap （InsightFace）
+
+## 模型列表
+
+### midjourney-proxy支持
+
+- mj_imagine (绘图)
+- mj_variation (变换)
+- mj_reroll (重绘)
+- mj_blend (混合)
+- mj_upscale (放大)
+- mj_describe (图生文)
+
+### 仅midjourney-proxy-plus支持
+
+- mj_zoom (比例变焦)
+- mj_shorten (提示词缩短)
+- mj_modal (窗口提交，局部重绘和自定义比例变焦必须和mj_modal一同添加)
+- mj_inpaint (局部重绘提交，必须和mj_modal一同添加)
+- mj_custom_zoom (自定义比例变焦，必须和mj_modal一同添加)
+- mj_high_variation (强变换)
+- mj_low_variation (弱变换)
+- mj_pan (平移)
+- swap_face (换脸)
+
+## 模型价格设置（在设置-运营设置-模型固定价格设置中设置）
+```json
+{
+  "mj_imagine": 0.1,
+  "mj_variation": 0.1,
+  "mj_reroll": 0.1,
+  "mj_blend": 0.1,
+  "mj_modal": 0.1,
+  "mj_zoom": 0.1,
+  "mj_shorten": 0.1,
+  "mj_high_variation": 0.1,
+  "mj_low_variation": 0.1,
+  "mj_pan": 0.1,
+  "mj_inpaint": 0,
+  "mj_custom_zoom": 0,
+  "mj_describe": 0.05,
+  "mj_upscale": 0.05,
+  "swap_face": 0.05
+}
+```
+其中mj_inpaint和mj_custom_zoom的价格设置为0，是因为这两个模型需要搭配mj_modal使用，所以价格由mj_modal决定。
+
+## 渠道设置
+
+### 对接 midjourney-proxy(plus)
+
+1.
+
+部署Midjourney-Proxy，并配置好midjourney账号等（强烈建议设置密钥），[项目地址](https://github.com/novicezk/midjourney-proxy)
+
+2. 在渠道管理中添加渠道，渠道类型选择**Midjourney Proxy**，如果是plus版本选择**Midjourney Proxy Plus**
+   ，模型请参考上方模型列表
+3. **代理**填写midjourney-proxy部署的地址，例如：http://localhost:8080
+4. 密钥填写midjourney-proxy的密钥，如果没有设置密钥，可以随便填
+
+### 对接上游new api
+
+1. 在渠道管理中添加渠道，渠道类型选择**Midjourney Proxy Plus**，模型请参考上方模型列表
+2. **代理**填写上游new api的地址，例如：http://localhost:3000
+3. 密钥填写上游new api的密钥
--- a/docs/models/Rerank.md
+++ b/docs/models/Rerank.md
@@ -0,0 +1,62 @@
+# Rerank API文档
+
+**简介**:Rerank API文档
+
+## 接入Dify
+模型供应商选择Jina，按要求填写模型信息即可接入Dify。
+
+## 请求方式
+
+Post: /v1/rerank
+
+Request:
+
+```json
+{
+  "model": "jina-reranker-v2-base-multilingual",
+  "query": "What is the capital of the United States?",
+  "top_n": 3,
+  "documents": [
+    "Carson City is the capital city of the American state of Nevada.",
+    "The Commonwealth of the Northern Mariana Islands is a group of islands in the Pacific Ocean. Its capital is Saipan.",
+    "Washington, D.C. (also known as simply Washington or D.C., and officially as the District of Columbia) is the capital of the United States. It is a federal district.",
+    "Capitalization or capitalisation in English grammar is the use of a capital letter at the start of a word. English usage varies from capitalization in other languages.",
+    "Capital punishment (the death penalty) has existed in the United States since beforethe United States was a country. As of 2017, capital punishment is legal in 30 of the 50 states."
+  ]
+}
+```
+
+Response:
+
+```json
+{
+  "results": [
+    {
+      "document": {
+        "text": "Washington, D.C. (also known as simply Washington or D.C., and officially as the District of Columbia) is the capital of the United States. It is a federal district."
+      },
+      "index": 2,
+      "relevance_score": 0.9999702
+    },
+    {
+      "document": {
+        "text": "Carson City is the capital city of the American state of Nevada."
+      },
+      "index": 0,
+      "relevance_score": 0.67800725
+    },
+    {
+      "document": {
+        "text": "Capitalization or capitalisation in English grammar is the use of a capital letter at the start of a word. English usage varies from capitalization in other languages."
+      },
+      "index": 3,
+      "relevance_score": 0.02800752
+    }
+  ],
+  "usage": {
+    "prompt_tokens": 158,
+    "completion_tokens": 0,
+    "total_tokens": 158
+  }
+}
+```
--- a/docs/models/Suno.md
+++ b/docs/models/Suno.md
@@ -0,0 +1,44 @@
+# Suno API文档
+
+**简介**:Suno API文档
+
+## 接口列表
+支持的接口如下：
+ [x] /suno/submit/music
+ [x] /suno/submit/lyrics
+ [x] /suno/fetch
+ [x] /suno/fetch/:id
+
+## 模型列表
+
+### Suno API支持
+
+- suno_music (自定义模式、灵感模式、续写)
+- suno_lyrics (生成歌词)
+
+
+## 模型价格设置（在设置-运营设置-模型固定价格设置中设置）
+```json
+{
+  "suno_music": 0.3,
+  "suno_lyrics": 0.01
+}
+```
+
+## 渠道设置
+
+### 对接 Suno API
+
+1.
+部署 Suno API，并配置好suno账号等（强烈建议设置密钥），[项目地址](https://github.com/Suno-API/Suno-API)
+
+2. 在渠道管理中添加渠道，渠道类型选择**Suno API**
+   ，模型请参考上方模型列表
+3. **代理**填写 Suno API 部署的地址，例如：http://localhost:8080
+4. 密钥填写 Suno API 的密钥，如果没有设置密钥，可以随便填
+
+### 对接上游new api
+
+1. 在渠道管理中添加渠道，渠道类型选择**Suno API**，或任意类型，只需模型包含上方模型列表的模型
+2. **代理**填写上游new api的地址，例如：http://localhost:3000
+3. 密钥填写上游new api的密钥
--- a/docs/openapi/api.json
+++ b/docs/openapi/api.json
--- a/docs/openapi/relay.json
+++ b/docs/openapi/relay.json
--- a/dto/audio.go
+++ b/dto/audio.go
@@ -2,7 +2,6 @@ package dto

 import (
 	"encoding/json"
-	"strings"

 	"github.com/QuantumNous/new-api/types"

@@ -25,14 +24,11 @@ func (r *AudioRequest) GetTokenCountMeta() *types.TokenCountMeta {
 		CombineText: r.Input,
 		TokenType:   types.TokenTypeTextNumber,
 	}
-	if strings.Contains(r.Model, "gpt") {
-		meta.TokenType = types.TokenTypeTokenizer
-	}
 	return meta
 }

 func (r *AudioRequest) IsStream(c *gin.Context) bool {
-	return r.StreamFormat == "sse"
+	return false
 }

 func (r *AudioRequest) SetModelName(modelName string) {
--- a/dto/claude.go
+++ b/dto/claude.go
@@ -203,9 +203,6 @@ type ClaudeRequest struct {
 	Stream            bool            `json:"stream,omitempty"`
 	Tools             any             `json:"tools,omitempty"`
 	ContextManagement json.RawMessage `json:"context_management,omitempty"`
-	OutputConfig      json.RawMessage `json:"output_config,omitempty"`
-	OutputFormat      json.RawMessage `json:"output_format,omitempty"`
-	Container         json.RawMessage `json:"container,omitempty"`
 	ToolChoice        any             `json:"tool_choice,omitempty"`
 	Thinking          *Thinking       `json:"thinking,omitempty"`
 	McpServers        json.RawMessage `json:"mcp_servers,omitempty"`
--- a/dto/error.go
+++ b/dto/error.go
@@ -1,32 +1,26 @@
 package dto

-import (
-	"encoding/json"
+import "github.com/QuantumNous/new-api/types"

-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/types"
-)
-
-//type OpenAIError struct {
-//	Message string `json:"message"`
-//	Type    string `json:"type"`
-//	Param   string `json:"param"`
-//	Code    any    `json:"code"`
-//}
+type OpenAIError struct {
+	Message string `json:"message"`
+	Type    string `json:"type"`
+	Param   string `json:"param"`
+	Code    any    `json:"code"`
+}

 type OpenAIErrorWithStatusCode struct {
-	Error      types.OpenAIError `json:"error"`
-	StatusCode int               `json:"status_code"`
+	Error      OpenAIError `json:"error"`
+	StatusCode int         `json:"status_code"`
 	LocalError bool
 }

 type GeneralErrorResponse struct {
-	Error    json.RawMessage `json:"error"`
-	Message  string          `json:"message"`
-	Msg      string          `json:"msg"`
-	Err      string          `json:"err"`
-	ErrorMsg string          `json:"error_msg"`
-	Metadata json.RawMessage   `json:"metadata,omitempty"`
+	Error    types.OpenAIError `json:"error"`
+	Message  string            `json:"message"`
+	Msg      string            `json:"msg"`
+	Err      string            `json:"err"`
+	ErrorMsg string            `json:"error_msg"`
 	Header   struct {
 		Message string `json:"message"`
 	} `json:"header"`
@@ -37,35 +31,9 @@ type GeneralErrorResponse struct {
 	} `json:"response"`
 }

-func (e GeneralErrorResponse) TryToOpenAIError() *types.OpenAIError {
-	var openAIError types.OpenAIError
-	if len(e.Error) > 0 {
-		err := common.Unmarshal(e.Error, &openAIError)
-		if err == nil && openAIError.Message != "" {
-			return &openAIError
-		}
-	}
-	return nil
-}
-
 func (e GeneralErrorResponse) ToMessage() string {
-	if len(e.Error) > 0 {
-		switch common.GetJsonType(e.Error) {
-		case "object":
-			var openAIError types.OpenAIError
-			err := common.Unmarshal(e.Error, &openAIError)
-			if err == nil && openAIError.Message != "" {
-				return openAIError.Message
-			}
-		case "string":
-			var msg string
-			err := common.Unmarshal(e.Error, &msg)
-			if err == nil && msg != "" {
-				return msg
-			}
-		default:
-			return string(e.Error)
-		}
+	if e.Error.Message != "" {
+		return e.Error.Message
 	}
 	if e.Message != "" {
 		return e.Message
--- a/dto/gemini.go
+++ b/dto/gemini.go
@@ -22,27 +22,6 @@ type GeminiChatRequest struct {
 	CachedContent      string                     `json:"cachedContent,omitempty"`
 }

-// UnmarshalJSON allows GeminiChatRequest to accept both snake_case and camelCase fields.
-func (r *GeminiChatRequest) UnmarshalJSON(data []byte) error {
-	type Alias GeminiChatRequest
-	var aux struct {
-		Alias
-		SystemInstructionSnake *GeminiChatContent `json:"system_instruction,omitempty"`
-	}
-
-	if err := common.Unmarshal(data, &aux); err != nil {
-		return err
-	}
-
-	*r = GeminiChatRequest(aux.Alias)
-
-	if aux.SystemInstructionSnake != nil {
-		r.SystemInstructions = aux.SystemInstructionSnake
-	}
-
-	return nil
-}
-
 type ToolConfig struct {
 	FunctionCallingConfig *FunctionCallingConfig `json:"functionCallingConfig,omitempty"`
 	RetrievalConfig       *RetrievalConfig       `json:"retrievalConfig,omitempty"`
@@ -126,7 +105,7 @@ func (r *GeminiChatRequest) SetModelName(modelName string) {

 func (r *GeminiChatRequest) GetTools() []GeminiChatTool {
 	var tools []GeminiChatTool
-	if strings.HasPrefix(string(r.Tools), "[") {
+	if strings.HasSuffix(string(r.Tools), "[") {
 		// is array
 		if err := common.Unmarshal(r.Tools, &tools); err != nil {
 			logger.LogError(nil, "error_unmarshalling_tools: "+err.Error())
@@ -163,7 +142,7 @@ type GeminiThinkingConfig struct {
 	IncludeThoughts bool `json:"includeThoughts,omitempty"`
 	ThinkingBudget  *int `json:"thinkingBudget,omitempty"`
 	// TODO Conflict with thinkingbudget.
-	ThinkingLevel string `json:"thinkingLevel,omitempty"`
+	ThinkingLevel json.RawMessage `json:"thinkingLevel,omitempty"`
 }

 // UnmarshalJSON allows GeminiThinkingConfig to accept both snake_case and camelCase fields.
@@ -171,9 +150,9 @@ func (c *GeminiThinkingConfig) UnmarshalJSON(data []byte) error {
 	type Alias GeminiThinkingConfig
 	var aux struct {
 		Alias
-		IncludeThoughtsSnake *bool  `json:"include_thoughts,omitempty"`
-		ThinkingBudgetSnake  *int   `json:"thinking_budget,omitempty"`
-		ThinkingLevelSnake   string `json:"thinking_level,omitempty"`
+		IncludeThoughtsSnake *bool           `json:"include_thoughts,omitempty"`
+		ThinkingBudgetSnake  *int            `json:"thinking_budget,omitempty"`
+		ThinkingLevelSnake   json.RawMessage `json:"thinking_level,omitempty"`
 	}

 	if err := common.Unmarshal(data, &aux); err != nil {
@@ -190,7 +169,7 @@ func (c *GeminiThinkingConfig) UnmarshalJSON(data []byte) error {
 		c.ThinkingBudget = aux.ThinkingBudgetSnake
 	}

-	if aux.ThinkingLevelSnake != "" {
+	if len(aux.ThinkingLevelSnake) > 0 {
 		c.ThinkingLevel = aux.ThinkingLevelSnake
 	}

--- a/dto/openai_image.go
+++ b/dto/openai_image.go
@@ -27,11 +27,8 @@ type ImageRequest struct {
 	OutputCompression json.RawMessage `json:"output_compression,omitempty"`
 	PartialImages     json.RawMessage `json:"partial_images,omitempty"`
 	// Stream            bool            `json:"stream,omitempty"`
-	Watermark *bool `json:"watermark,omitempty"`
-	// zhipu 4v
-	WatermarkEnabled json.RawMessage `json:"watermark_enabled,omitempty"`
-	UserId           json.RawMessage `json:"user_id,omitempty"`
-	Image            json.RawMessage `json:"image,omitempty"`
+	Watermark *bool           `json:"watermark,omitempty"`
+	Image     json.RawMessage `json:"image,omitempty"`
 	// 用匿名参数接收额外参数
 	Extra map[string]json.RawMessage `json:"-"`
 }
@@ -167,9 +164,9 @@ func (i *ImageRequest) SetModelName(modelName string) {
 }

 type ImageResponse struct {
-	Data     []ImageData     `json:"data"`
-	Created  int64           `json:"created"`
-	Metadata json.RawMessage `json:"metadata,omitempty"`
+	Data    []ImageData `json:"data"`
+	Created int64       `json:"created"`
+	Extra   any         `json:"extra,omitempty"`
 }
 type ImageData struct {
 	Url           string `json:"url"`
--- a/dto/openai_request.go
+++ b/dto/openai_request.go
@@ -23,8 +23,6 @@ type FormatJsonSchema struct {
 	Strict      json.RawMessage `json:"strict,omitempty"`
 }

-// GeneralOpenAIRequest represents a general request structure for OpenAI-compatible APIs.
-// 参数增加规范：无引用的参数必须使用json.RawMessage类型，并添加omitempty标签
 type GeneralOpenAIRequest struct {
 	Model               string            `json:"model,omitempty"`
 	Messages            []Message         `json:"messages,omitempty"`
@@ -84,9 +82,7 @@ type GeneralOpenAIRequest struct {
 	Reasoning json.RawMessage `json:"reasoning,omitempty"`
 	// Ali Qwen Params
 	VlHighResolutionImages json.RawMessage `json:"vl_high_resolution_images,omitempty"`
-	EnableThinking         json.RawMessage `json:"enable_thinking,omitempty"`
-	ChatTemplateKwargs     json.RawMessage `json:"chat_template_kwargs,omitempty"`
-	EnableSearch           json.RawMessage `json:"enable_search,omitempty"`
+	EnableThinking         any             `json:"enable_thinking,omitempty"`
 	// ollama Params
 	Think json.RawMessage `json:"think,omitempty"`
 	// baidu v2
--- a/go.mod
+++ b/go.mod
@@ -27,17 +27,15 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/grafana/pyroscope-go v1.2.7
 	github.com/jfreymuth/oggvorbis v1.0.5
 	github.com/jinzhu/copier v0.4.0
 	github.com/joho/godotenv v1.5.1
 	github.com/mewkiz/flac v1.0.13
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.5.0
-	github.com/samber/lo v1.52.0
+	github.com/samber/lo v1.39.0
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/shopspring/decimal v1.4.0
-	github.com/stretchr/testify v1.11.1
 	github.com/stripe/stripe-go/v81 v81.4.0
 	github.com/tcolgate/mp3 v0.0.0-20170426193717-e79c5a46d300
 	github.com/thanhpk/randstr v1.0.6
@@ -64,7 +62,6 @@ require (
 	github.com/bytedance/sonic/loader v0.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -80,11 +77,11 @@ require (
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/go-webauthn/x v0.1.25 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-tpm v0.9.5 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/gorilla/sessions v1.2.1 // indirect
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
 	github.com/icza/bitio v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -94,7 +91,6 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -103,11 +99,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -117,13 +110,13 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	golang.org/x/arch v0.21.0 // indirect
-	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
+	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.66.10 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.40.1 // indirect
+	modernc.org/libc v1.22.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.5.0 // indirect
+	modernc.org/sqlite v1.23.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -118,8 +118,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU=
 github.com/google/go-tpm v0.9.5/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -131,10 +131,6 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/pyroscope-go v1.2.7 h1:VWBBlqxjyR0Cwk2W6UrE8CdcdD80GOFNutj0Kb1T8ac=
-github.com/grafana/pyroscope-go v1.2.7/go.mod h1:o/bpSLiJYYP6HQtvcoVKiE9s5RiNgjYTj1DhiddP2Pc=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.9 h1:c1Us8i6eSmkW+Ez05d3co8kasnuOY813tbMN8i/a3Og=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.9/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0=
 github.com/icza/bitio v1.1.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
 github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
@@ -163,15 +159,12 @@ github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwA
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
-github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -200,8 +193,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
@@ -220,13 +211,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
 github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
-github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
+github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
+github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
@@ -234,7 +226,6 @@ github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+D
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -292,12 +283,10 @@ golang.org/x/arch v0.21.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
 golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
-golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
+golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
+golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
 golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
-golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
@@ -325,8 +314,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
 golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
@@ -356,29 +343,11 @@ gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBp
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
 gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
-modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
-modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
-modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
-modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
-modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
-modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
-modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
-modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
-modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
-modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.40.1 h1:VfuXcxcUWWKRBuP8+BR9L7VnmusMgBNNnBYGEe9w/iY=
-modernc.org/sqlite v1.40.1/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
+modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
+modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
--- a/main.go
+++ b/main.go
@@ -124,11 +124,6 @@ func main() {
 		common.SysLog("pprof enabled")
 	}

-	err = common.StartPyroScope()
-	if err != nil {
-		common.SysError(fmt.Sprintf("start pyroscope error : %v", err))
-	}
-
 	// Initialize HTTP server
 	server := gin.New()
 	server.Use(gin.CustomRecovery(func(c *gin.Context, err any) {
@@ -188,7 +183,6 @@ func InjectUmamiAnalytics() {
 		analyticsInjectBuilder.WriteString(umamiSiteID)
 		analyticsInjectBuilder.WriteString("\"></script>")
 	}
-	analyticsInjectBuilder.WriteString("<!--Umami QuantumNous-->\n")
 	analyticsInject := analyticsInjectBuilder.String()
 	indexPage = bytes.ReplaceAll(indexPage, []byte("<!--umami-->\n"), []byte(analyticsInject))
 }
@@ -210,7 +204,6 @@ func InjectGoogleAnalytics() {
 		analyticsInjectBuilder.WriteString("');")
 		analyticsInjectBuilder.WriteString("</script>")
 	}
-	analyticsInjectBuilder.WriteString("<!--Google Analytics QuantumNous-->\n")
 	analyticsInject := analyticsInjectBuilder.String()
 	indexPage = bytes.ReplaceAll(indexPage, []byte("<!--Google Analytics-->\n"), []byte(analyticsInject))
 }
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -2,14 +2,12 @@ package middleware

 import (
 	"fmt"
-	"net"
 	"net/http"
 	"strconv"
 	"strings"

 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/constant"
-	"github.com/QuantumNous/new-api/logger"
 	"github.com/QuantumNous/new-api/model"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/ratio_setting"
@@ -195,8 +193,8 @@ func TokenAuth() func(c *gin.Context) {
 			}
 			c.Request.Header.Set("Authorization", "Bearer "+key)
 		}
-		// 检查path包含/v1/messages 或 /v1/models 
-		if strings.Contains(c.Request.URL.Path, "/v1/messages") || strings.Contains(c.Request.URL.Path, "/v1/models") {
+		// 检查path包含/v1/messages
+		if strings.Contains(c.Request.URL.Path, "/v1/messages") {
 			anthropicKey := c.Request.Header.Get("x-api-key")
 			if anthropicKey != "" {
 				c.Request.Header.Set("Authorization", "Bearer "+anthropicKey)
@@ -218,14 +216,10 @@ func TokenAuth() func(c *gin.Context) {
 		}
 		key := c.Request.Header.Get("Authorization")
 		parts := make([]string, 0)
-		if strings.HasPrefix(key, "Bearer ") || strings.HasPrefix(key, "bearer ") {
-			key = strings.TrimSpace(key[7:])
-		}
+		key = strings.TrimPrefix(key, "Bearer ")
 		if key == "" || key == "midjourney-proxy" {
 			key = c.Request.Header.Get("mj-api-secret")
-			if strings.HasPrefix(key, "Bearer ") || strings.HasPrefix(key, "bearer ") {
-				key = strings.TrimSpace(key[7:])
-			}
+			key = strings.TrimPrefix(key, "Bearer ")
 			key = strings.TrimPrefix(key, "sk-")
 			parts = strings.Split(key, "-")
 			key = parts[0]
@@ -246,20 +240,13 @@ func TokenAuth() func(c *gin.Context) {
 			return
 		}

-		allowIps := token.GetIpLimits()
-		if len(allowIps) > 0 {
+		allowIpsMap := token.GetIpLimitsMap()
+		if len(allowIpsMap) != 0 {
 			clientIp := c.ClientIP()
-			logger.LogDebug(c, "Token has IP restrictions, checking client IP %s", clientIp)
-			ip := net.ParseIP(clientIp)
-			if ip == nil {
-				abortWithOpenAiMessage(c, http.StatusForbidden, "无法解析客户端 IP 地址")
-				return
-			}
-			if common.IsIpInCIDRList(ip, allowIps) == false {
+			if _, ok := allowIpsMap[clientIp]; !ok {
 				abortWithOpenAiMessage(c, http.StatusForbidden, "您的 IP 不在令牌允许访问的列表中")
 				return
 			}
-			logger.LogDebug(c, "Client IP %s passed the token IP restrictions check", clientIp)
 		}

 		userCache, err := model.GetUserCache(token.UserId)
@@ -320,8 +307,7 @@ func SetupContextForToken(c *gin.Context, token *model.Token, parts ...string) e
 	} else {
 		c.Set("token_model_limit_enabled", false)
 	}
-	common.SetContextKey(c, constant.ContextKeyTokenGroup, token.Group)
-	common.SetContextKey(c, constant.ContextKeyTokenCrossGroupRetry, token.CrossGroupRetry)
+	c.Set("token_group", token.Group)
 	if len(parts) > 1 {
 		if model.IsAdmin(token.UserId) {
 			c.Set("specific_channel_id", parts[1])
--- a/middleware/distributor.go
+++ b/middleware/distributor.go
@@ -97,12 +97,7 @@ func Distribute() func(c *gin.Context) {
 						common.SetContextKey(c, constant.ContextKeyUsingGroup, usingGroup)
 					}
 				}
-				channel, selectGroup, err = service.CacheGetRandomSatisfiedChannel(&service.RetryParam{
-					Ctx:        c,
-					ModelName:  modelRequest.Model,
-					TokenGroup: usingGroup,
-					Retry:      common.GetPointer(0),
-				})
+				channel, selectGroup, err = service.CacheGetRandomSatisfiedChannel(c, usingGroup, modelRequest.Model, 0)
 				if err != nil {
 					showGroup := usingGroup
 					if usingGroup == "auto" {
@@ -162,7 +157,7 @@ func getModelRequest(c *gin.Context) (*ModelRequest, bool, error) {
 			}
 			midjourneyModel, mjErr, success := service.GetMjRequestModel(relayMode, &midjourneyRequest)
 			if mjErr != nil {
-				return nil, false, fmt.Errorf("%s", mjErr.Description)
+				return nil, false, fmt.Errorf(mjErr.Description)
 			}
 			if midjourneyModel == "" {
 				if !success {
@@ -186,10 +181,6 @@ func getModelRequest(c *gin.Context) (*ModelRequest, bool, error) {
 		}
 		c.Set("platform", string(constant.TaskPlatformSuno))
 		c.Set("relay_mode", relayMode)
-	} else if strings.Contains(c.Request.URL.Path, "/v1/videos/") && strings.HasSuffix(c.Request.URL.Path, "/remix") {
-		relayMode := relayconstant.RelayModeVideoSubmit
-		c.Set("relay_mode", relayMode)
-		shouldSelectChannel = false
 	} else if strings.Contains(c.Request.URL.Path, "/v1/videos") {
 		//curl https://api.openai.com/v1/videos \
 		//  -H "Authorization: Bearer $OPENAI_API_KEY" \
--- a/middleware/gzip.go
+++ b/middleware/gzip.go
@@ -5,69 +5,32 @@ import (
 	"io"
 	"net/http"

-	"github.com/QuantumNous/new-api/constant"
 	"github.com/andybalholm/brotli"
 	"github.com/gin-gonic/gin"
 )

-type readCloser struct {
-	io.Reader
-	closeFn func() error
-}
-
-func (rc *readCloser) Close() error {
-	if rc.closeFn != nil {
-		return rc.closeFn()
-	}
-	return nil
-}
-
 func DecompressRequestMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		if c.Request.Body == nil || c.Request.Method == http.MethodGet {
 			c.Next()
 			return
 		}
-		maxMB := constant.MaxRequestBodyMB
-		if maxMB <= 0 {
-			maxMB = 32
-		}
-		maxBytes := int64(maxMB) << 20
-
-		origBody := c.Request.Body
-		wrapMaxBytes := func(body io.ReadCloser) io.ReadCloser {
-			return http.MaxBytesReader(c.Writer, body, maxBytes)
-		}
-
 		switch c.GetHeader("Content-Encoding") {
 		case "gzip":
-			gzipReader, err := gzip.NewReader(origBody)
+			gzipReader, err := gzip.NewReader(c.Request.Body)
 			if err != nil {
-				_ = origBody.Close()
 				c.AbortWithStatus(http.StatusBadRequest)
 				return
 			}
-			// Replace the request body with the decompressed data, and enforce a max size (post-decompression).
-			c.Request.Body = wrapMaxBytes(&readCloser{
-				Reader: gzipReader,
-				closeFn: func() error {
-					_ = gzipReader.Close()
-					return origBody.Close()
-				},
-			})
+			defer gzipReader.Close()
+
+			// Replace the request body with the decompressed data
+			c.Request.Body = io.NopCloser(gzipReader)
 			c.Request.Header.Del("Content-Encoding")
 		case "br":
-			reader := brotli.NewReader(origBody)
-			c.Request.Body = wrapMaxBytes(&readCloser{
-				Reader: reader,
-				closeFn: func() error {
-					return origBody.Close()
-				},
-			})
+			reader := brotli.NewReader(c.Request.Body)
+			c.Request.Body = io.NopCloser(reader)
 			c.Request.Header.Del("Content-Encoding")
-		default:
-			// Even for uncompressed bodies, enforce a max size to avoid huge request allocations.
-			c.Request.Body = wrapMaxBytes(origBody)
 		}

 		// Continue processing the request
--- a/model/channel.go
+++ b/model/channel.go
@@ -254,9 +254,6 @@ func (channel *Channel) Save() error {
 }

 func (channel *Channel) SaveWithoutKey() error {
-	if channel.Id == 0 {
-		return errors.New("channel ID is 0")
-	}
 	return DB.Omit("key").Save(channel).Error
 }

--- a/model/checkin.go
+++ b/model/checkin.go
@@ -1,179 +0,0 @@
-package model
-
-import (
-	"errors"
-	"math/rand"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/setting/operation_setting"
-	"gorm.io/gorm"
-)
-
-// Checkin 签到记录
-type Checkin struct {
-	Id           int    `json:"id" gorm:"primaryKey;autoIncrement"`
-	UserId       int    `json:"user_id" gorm:"not null;uniqueIndex:idx_user_checkin_date"`
-	CheckinDate  string `json:"checkin_date" gorm:"type:varchar(10);not null;uniqueIndex:idx_user_checkin_date"` // 格式: YYYY-MM-DD
-	QuotaAwarded int    `json:"quota_awarded" gorm:"not null"`
-	CreatedAt    int64  `json:"created_at" gorm:"bigint"`
-}
-
-// CheckinRecord 用于API返回的签到记录（不包含敏感字段）
-type CheckinRecord struct {
-	CheckinDate  string `json:"checkin_date"`
-	QuotaAwarded int    `json:"quota_awarded"`
-}
-
-func (Checkin) TableName() string {
-	return "checkins"
-}
-
-// GetUserCheckinRecords 获取用户在指定日期范围内的签到记录
-func GetUserCheckinRecords(userId int, startDate, endDate string) ([]Checkin, error) {
-	var records []Checkin
-	err := DB.Where("user_id = ? AND checkin_date >= ? AND checkin_date <= ?",
-		userId, startDate, endDate).
-		Order("checkin_date DESC").
-		Find(&records).Error
-	return records, err
-}
-
-// HasCheckedInToday 检查用户今天是否已签到
-func HasCheckedInToday(userId int) (bool, error) {
-	today := time.Now().Format("2006-01-02")
-	var count int64
-	err := DB.Model(&Checkin{}).
-		Where("user_id = ? AND checkin_date = ?", userId, today).
-		Count(&count).Error
-	return count > 0, err
-}
-
-// UserCheckin 执行用户签到
-// MySQL 和 PostgreSQL 使用事务保证原子性
-// SQLite 不支持嵌套事务，使用顺序操作 + 手动回滚
-func UserCheckin(userId int) (*Checkin, error) {
-	setting := operation_setting.GetCheckinSetting()
-	if !setting.Enabled {
-		return nil, errors.New("签到功能未启用")
-	}
-
-	// 检查今天是否已签到
-	hasChecked, err := HasCheckedInToday(userId)
-	if err != nil {
-		return nil, err
-	}
-	if hasChecked {
-		return nil, errors.New("今日已签到")
-	}
-
-	// 计算随机额度奖励
-	quotaAwarded := setting.MinQuota
-	if setting.MaxQuota > setting.MinQuota {
-		quotaAwarded = setting.MinQuota + rand.Intn(setting.MaxQuota-setting.MinQuota+1)
-	}
-
-	today := time.Now().Format("2006-01-02")
-	checkin := &Checkin{
-		UserId:       userId,
-		CheckinDate:  today,
-		QuotaAwarded: quotaAwarded,
-		CreatedAt:    time.Now().Unix(),
-	}
-
-	// 根据数据库类型选择不同的策略
-	if common.UsingSQLite {
-		// SQLite 不支持嵌套事务，使用顺序操作 + 手动回滚
-		return userCheckinWithoutTransaction(checkin, userId, quotaAwarded)
-	}
-
-	// MySQL 和 PostgreSQL 支持事务，使用事务保证原子性
-	return userCheckinWithTransaction(checkin, userId, quotaAwarded)
-}
-
-// userCheckinWithTransaction 使用事务执行签到（适用于 MySQL 和 PostgreSQL）
-func userCheckinWithTransaction(checkin *Checkin, userId int, quotaAwarded int) (*Checkin, error) {
-	err := DB.Transaction(func(tx *gorm.DB) error {
-		// 步骤1: 创建签到记录
-		// 数据库有唯一约束 (user_id, checkin_date)，可以防止并发重复签到
-		if err := tx.Create(checkin).Error; err != nil {
-			return errors.New("签到失败，请稍后重试")
-		}
-
-		// 步骤2: 在事务中增加用户额度
-		if err := tx.Model(&User{}).Where("id = ?", userId).
-			Update("quota", gorm.Expr("quota + ?", quotaAwarded)).Error; err != nil {
-			return errors.New("签到失败：更新额度出错")
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	// 事务成功后，异步更新缓存
-	go func() {
-		_ = cacheIncrUserQuota(userId, int64(quotaAwarded))
-	}()
-
-	return checkin, nil
-}
-
-// userCheckinWithoutTransaction 不使用事务执行签到（适用于 SQLite）
-func userCheckinWithoutTransaction(checkin *Checkin, userId int, quotaAwarded int) (*Checkin, error) {
-	// 步骤1: 创建签到记录
-	// 数据库有唯一约束 (user_id, checkin_date)，可以防止并发重复签到
-	if err := DB.Create(checkin).Error; err != nil {
-		return nil, errors.New("签到失败，请稍后重试")
-	}
-
-	// 步骤2: 增加用户额度
-	// 使用 db=true 强制直接写入数据库，不使用批量更新
-	if err := IncreaseUserQuota(userId, quotaAwarded, true); err != nil {
-		// 如果增加额度失败，需要回滚签到记录
-		DB.Delete(checkin)
-		return nil, errors.New("签到失败：更新额度出错")
-	}
-
-	return checkin, nil
-}
-
-// GetUserCheckinStats 获取用户签到统计信息
-func GetUserCheckinStats(userId int, month string) (map[string]interface{}, error) {
-	// 获取指定月份的所有签到记录
-	startDate := month + "-01"
-	endDate := month + "-31"
-
-	records, err := GetUserCheckinRecords(userId, startDate, endDate)
-	if err != nil {
-		return nil, err
-	}
-
-	// 转换为不包含敏感字段的记录
-	checkinRecords := make([]CheckinRecord, len(records))
-	for i, r := range records {
-		checkinRecords[i] = CheckinRecord{
-			CheckinDate:  r.CheckinDate,
-			QuotaAwarded: r.QuotaAwarded,
-		}
-	}
-
-	// 检查今天是否已签到
-	hasCheckedToday, _ := HasCheckedInToday(userId)
-
-	// 获取用户所有时间的签到统计
-	var totalCheckins int64
-	var totalQuota int64
-	DB.Model(&Checkin{}).Where("user_id = ?", userId).Count(&totalCheckins)
-	DB.Model(&Checkin{}).Where("user_id = ?", userId).Select("COALESCE(SUM(quota_awarded), 0)").Scan(&totalQuota)
-
-	return map[string]interface{}{
-		"total_quota":      totalQuota,      // 所有时间累计获得的额度
-		"total_checkins":   totalCheckins,   // 所有时间累计签到次数
-		"checkin_count":    len(records),    // 本月签到次数
-		"checked_in_today": hasCheckedToday, // 今天是否已签到
-		"records":          checkinRecords,  // 本月签到记录详情（不含id和user_id）
-	}, nil
-}
--- a/model/main.go
+++ b/model/main.go
@@ -267,7 +267,6 @@ func migrateDB() error {
 		&Setup{},
 		&TwoFA{},
 		&TwoFABackupCode{},
-		&Checkin{},
 	)
 	if err != nil {
 		return err
@@ -301,7 +300,6 @@ func migrateDBFast() error {
 		{&Setup{}, "Setup"},
 		{&TwoFA{}, "TwoFA"},
 		{&TwoFABackupCode{}, "TwoFABackupCode"},
-		{&Checkin{}, "Checkin"},
 	}
 	// 动态计算migration数量，确保errChan缓冲区足够大
 	errChan := make(chan error, len(migrations))
--- a/model/token.go
+++ b/model/token.go
@@ -6,6 +6,7 @@ import (
 	"strings"

 	"github.com/QuantumNous/new-api/common"
+
 	"github.com/bytedance/gopkg/util/gopool"
 	"gorm.io/gorm"
 )
@@ -26,7 +27,6 @@ type Token struct {
 	AllowIps           *string        `json:"allow_ips" gorm:"default:''"`
 	UsedQuota          int            `json:"used_quota" gorm:"default:0"` // used quota
 	Group              string         `json:"group" gorm:"default:''"`
-	CrossGroupRetry    bool           `json:"cross_group_retry"` // 跨分组重试，仅auto分组有效
 	DeletedAt          gorm.DeletedAt `gorm:"index"`
 }

@@ -34,26 +34,26 @@ func (token *Token) Clean() {
 	token.Key = ""
 }

-func (token *Token) GetIpLimits() []string {
+func (token *Token) GetIpLimitsMap() map[string]any {
 	// delete empty spaces
 	//split with \n
-	ipLimits := make([]string, 0)
+	ipLimitsMap := make(map[string]any)
 	if token.AllowIps == nil {
-		return ipLimits
+		return ipLimitsMap
 	}
 	cleanIps := strings.ReplaceAll(*token.AllowIps, " ", "")
 	if cleanIps == "" {
-		return ipLimits
+		return ipLimitsMap
 	}
 	ips := strings.Split(cleanIps, "\n")
 	for _, ip := range ips {
 		ip = strings.TrimSpace(ip)
 		ip = strings.ReplaceAll(ip, ",", "")
-		if ip != "" {
-			ipLimits = append(ipLimits, ip)
+		if common.IsIP(ip) {
+			ipLimitsMap[ip] = true
 		}
 	}
-	return ipLimits
+	return ipLimitsMap
 }

 func GetAllUserTokens(userId int, startIdx int, num int) ([]*Token, error) {
@@ -112,12 +112,7 @@ func ValidateUserToken(key string) (token *Token, err error) {
 		}
 		return token, nil
 	}
-	common.SysLog("ValidateUserToken: failed to get token: " + err.Error())
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, errors.New("无效的令牌")
-	} else {
-		return nil, errors.New("无效的令牌，数据库查询出错，请联系管理员")
-	}
+	return nil, errors.New("无效的令牌")
 }

 func GetTokenByIds(id int, userId int) (*Token, error) {
@@ -190,7 +185,7 @@ func (token *Token) Update() (err error) {
 		}
 	}()
 	err = DB.Model(token).Select("name", "status", "expired_time", "remain_quota", "unlimited_quota",
-		"model_limits_enabled", "model_limits", "allow_ips", "group", "cross_group_retry").Updates(token).Error
+		"model_limits_enabled", "model_limits", "allow_ips", "group").Updates(token).Error
 	return err
 }

--- a/pkg/ionet/client.go
+++ b/pkg/ionet/client.go
@@ -1,219 +0,0 @@
-package ionet
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"time"
-)
-
-const (
-	DefaultEnterpriseBaseURL = "https://api.io.solutions/enterprise/v1/io-cloud/caas"
-	DefaultBaseURL           = "https://api.io.solutions/v1/io-cloud/caas"
-	DefaultTimeout           = 30 * time.Second
-)
-
-// DefaultHTTPClient is the default HTTP client implementation
-type DefaultHTTPClient struct {
-	client *http.Client
-}
-
-// NewDefaultHTTPClient creates a new default HTTP client
-func NewDefaultHTTPClient(timeout time.Duration) *DefaultHTTPClient {
-	return &DefaultHTTPClient{
-		client: &http.Client{
-			Timeout: timeout,
-		},
-	}
-}
-
-// Do executes an HTTP request
-func (c *DefaultHTTPClient) Do(req *HTTPRequest) (*HTTPResponse, error) {
-	httpReq, err := http.NewRequest(req.Method, req.URL, bytes.NewReader(req.Body))
-	if err != nil {
-		return nil, fmt.Errorf("failed to create HTTP request: %w", err)
-	}
-
-	// Set headers
-	for key, value := range req.Headers {
-		httpReq.Header.Set(key, value)
-	}
-
-	resp, err := c.client.Do(httpReq)
-	if err != nil {
-		return nil, fmt.Errorf("HTTP request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	// Read response body
-	var body bytes.Buffer
-	_, err = body.ReadFrom(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %w", err)
-	}
-
-	// Convert headers
-	headers := make(map[string]string)
-	for key, values := range resp.Header {
-		if len(values) > 0 {
-			headers[key] = values[0]
-		}
-	}
-
-	return &HTTPResponse{
-		StatusCode: resp.StatusCode,
-		Headers:    headers,
-		Body:       body.Bytes(),
-	}, nil
-}
-
-// NewEnterpriseClient creates a new IO.NET API client targeting the enterprise API base URL.
-func NewEnterpriseClient(apiKey string) *Client {
-	return NewClientWithConfig(apiKey, DefaultEnterpriseBaseURL, nil)
-}
-
-// NewClient creates a new IO.NET API client targeting the public API base URL.
-func NewClient(apiKey string) *Client {
-	return NewClientWithConfig(apiKey, DefaultBaseURL, nil)
-}
-
-// NewClientWithConfig creates a new IO.NET API client with custom configuration
-func NewClientWithConfig(apiKey, baseURL string, httpClient HTTPClient) *Client {
-	if baseURL == "" {
-		baseURL = DefaultBaseURL
-	}
-	if httpClient == nil {
-		httpClient = NewDefaultHTTPClient(DefaultTimeout)
-	}
-	return &Client{
-		BaseURL:    baseURL,
-		APIKey:     apiKey,
-		HTTPClient: httpClient,
-	}
-}
-
-// makeRequest performs an HTTP request and handles common response processing
-func (c *Client) makeRequest(method, endpoint string, body interface{}) (*HTTPResponse, error) {
-	var reqBody []byte
-	var err error
-
-	if body != nil {
-		reqBody, err = json.Marshal(body)
-		if err != nil {
-			return nil, fmt.Errorf("failed to marshal request body: %w", err)
-		}
-	}
-
-	headers := map[string]string{
-		"X-API-KEY":    c.APIKey,
-		"Content-Type": "application/json",
-	}
-
-	req := &HTTPRequest{
-		Method:  method,
-		URL:     c.BaseURL + endpoint,
-		Headers: headers,
-		Body:    reqBody,
-	}
-
-	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("request failed: %w", err)
-	}
-
-	// Handle API errors
-	if resp.StatusCode >= 400 {
-		var apiErr APIError
-		if len(resp.Body) > 0 {
-			// Try to parse the actual error format: {"detail": "message"}
-			var errorResp struct {
-				Detail string `json:"detail"`
-			}
-			if err := json.Unmarshal(resp.Body, &errorResp); err == nil && errorResp.Detail != "" {
-				apiErr = APIError{
-					Code:    resp.StatusCode,
-					Message: errorResp.Detail,
-				}
-			} else {
-				// Fallback: use raw body as details
-				apiErr = APIError{
-					Code:    resp.StatusCode,
-					Message: fmt.Sprintf("API request failed with status %d", resp.StatusCode),
-					Details: string(resp.Body),
-				}
-			}
-		} else {
-			apiErr = APIError{
-				Code:    resp.StatusCode,
-				Message: fmt.Sprintf("API request failed with status %d", resp.StatusCode),
-			}
-		}
-		return nil, &apiErr
-	}
-
-	return resp, nil
-}
-
-// buildQueryParams builds query parameters for GET requests
-func buildQueryParams(params map[string]interface{}) string {
-	if len(params) == 0 {
-		return ""
-	}
-
-	values := url.Values{}
-	for key, value := range params {
-		if value == nil {
-			continue
-		}
-		switch v := value.(type) {
-		case string:
-			if v != "" {
-				values.Add(key, v)
-			}
-		case int:
-			if v != 0 {
-				values.Add(key, strconv.Itoa(v))
-			}
-		case int64:
-			if v != 0 {
-				values.Add(key, strconv.FormatInt(v, 10))
-			}
-		case float64:
-			if v != 0 {
-				values.Add(key, strconv.FormatFloat(v, 'f', -1, 64))
-			}
-		case bool:
-			values.Add(key, strconv.FormatBool(v))
-		case time.Time:
-			if !v.IsZero() {
-				values.Add(key, v.Format(time.RFC3339))
-			}
-		case *time.Time:
-			if v != nil && !v.IsZero() {
-				values.Add(key, v.Format(time.RFC3339))
-			}
-		case []int:
-			if len(v) > 0 {
-				if encoded, err := json.Marshal(v); err == nil {
-					values.Add(key, string(encoded))
-				}
-			}
-		case []string:
-			if len(v) > 0 {
-				if encoded, err := json.Marshal(v); err == nil {
-					values.Add(key, string(encoded))
-				}
-			}
-		default:
-			values.Add(key, fmt.Sprint(v))
-		}
-	}
-
-	if len(values) > 0 {
-		return "?" + values.Encode()
-	}
-	return ""
-}
--- a/pkg/ionet/container.go
+++ b/pkg/ionet/container.go
@@ -1,302 +0,0 @@
-package ionet
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/samber/lo"
-)
-
-// ListContainers retrieves all containers for a specific deployment
-func (c *Client) ListContainers(deploymentID string) (*ContainerList, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/containers", deploymentID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to list containers: %w", err)
-	}
-
-	var containerList ContainerList
-	if err := decodeDataWithFlexibleTimes(resp.Body, &containerList); err != nil {
-		return nil, fmt.Errorf("failed to parse containers list: %w", err)
-	}
-
-	return &containerList, nil
-}
-
-// GetContainerDetails retrieves detailed information about a specific container
-func (c *Client) GetContainerDetails(deploymentID, containerID string) (*Container, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return nil, fmt.Errorf("container ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/container/%s", deploymentID, containerID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get container details: %w", err)
-	}
-
-	// API response format not documented, assuming direct format
-	var container Container
-	if err := decodeWithFlexibleTimes(resp.Body, &container); err != nil {
-		return nil, fmt.Errorf("failed to parse container details: %w", err)
-	}
-
-	return &container, nil
-}
-
-// GetContainerJobs retrieves containers jobs for a specific container (similar to containers endpoint)
-func (c *Client) GetContainerJobs(deploymentID, containerID string) (*ContainerList, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return nil, fmt.Errorf("container ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/containers-jobs/%s", deploymentID, containerID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get container jobs: %w", err)
-	}
-
-	var containerList ContainerList
-	if err := decodeDataWithFlexibleTimes(resp.Body, &containerList); err != nil {
-		return nil, fmt.Errorf("failed to parse container jobs: %w", err)
-	}
-
-	return &containerList, nil
-}
-
-// buildLogEndpoint constructs the request path for fetching logs
-func buildLogEndpoint(deploymentID, containerID string, opts *GetLogsOptions) (string, error) {
-	if deploymentID == "" {
-		return "", fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return "", fmt.Errorf("container ID cannot be empty")
-	}
-
-	params := make(map[string]interface{})
-
-	if opts != nil {
-		if opts.Level != "" {
-			params["level"] = opts.Level
-		}
-		if opts.Stream != "" {
-			params["stream"] = opts.Stream
-		}
-		if opts.Limit > 0 {
-			params["limit"] = opts.Limit
-		}
-		if opts.Cursor != "" {
-			params["cursor"] = opts.Cursor
-		}
-		if opts.Follow {
-			params["follow"] = true
-		}
-
-		if opts.StartTime != nil {
-			params["start_time"] = opts.StartTime
-		}
-		if opts.EndTime != nil {
-			params["end_time"] = opts.EndTime
-		}
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/log/%s", deploymentID, containerID)
-	endpoint += buildQueryParams(params)
-
-	return endpoint, nil
-}
-
-// GetContainerLogs retrieves logs for containers in a deployment and normalizes them
-func (c *Client) GetContainerLogs(deploymentID, containerID string, opts *GetLogsOptions) (*ContainerLogs, error) {
-	raw, err := c.GetContainerLogsRaw(deploymentID, containerID, opts)
-	if err != nil {
-		return nil, err
-	}
-
-	logs := &ContainerLogs{
-		ContainerID: containerID,
-	}
-
-	if raw == "" {
-		return logs, nil
-	}
-
-	normalized := strings.ReplaceAll(raw, "\r\n", "\n")
-	lines := strings.Split(normalized, "\n")
-	logs.Logs = lo.FilterMap(lines, func(line string, _ int) (LogEntry, bool) {
-		if strings.TrimSpace(line) == "" {
-			return LogEntry{}, false
-		}
-		return LogEntry{Message: line}, true
-	})
-
-	return logs, nil
-}
-
-// GetContainerLogsRaw retrieves the raw text logs for a specific container
-func (c *Client) GetContainerLogsRaw(deploymentID, containerID string, opts *GetLogsOptions) (string, error) {
-	endpoint, err := buildLogEndpoint(deploymentID, containerID, opts)
-	if err != nil {
-		return "", err
-	}
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return "", fmt.Errorf("failed to get container logs: %w", err)
-	}
-
-	return string(resp.Body), nil
-}
-
-// StreamContainerLogs streams real-time logs for a specific container
-// This method uses a callback function to handle incoming log entries
-func (c *Client) StreamContainerLogs(deploymentID, containerID string, opts *GetLogsOptions, callback func(*LogEntry) error) error {
-	if deploymentID == "" {
-		return fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return fmt.Errorf("container ID cannot be empty")
-	}
-	if callback == nil {
-		return fmt.Errorf("callback function cannot be nil")
-	}
-
-	// Set follow to true for streaming
-	if opts == nil {
-		opts = &GetLogsOptions{}
-	}
-	opts.Follow = true
-
-	endpoint, err := buildLogEndpoint(deploymentID, containerID, opts)
-	if err != nil {
-		return err
-	}
-
-	// Note: This is a simplified implementation. In a real scenario, you might want to use
-	// Server-Sent Events (SSE) or WebSocket for streaming logs
-	for {
-		resp, err := c.makeRequest("GET", endpoint, nil)
-		if err != nil {
-			return fmt.Errorf("failed to stream container logs: %w", err)
-		}
-
-		var logs ContainerLogs
-		if err := decodeWithFlexibleTimes(resp.Body, &logs); err != nil {
-			return fmt.Errorf("failed to parse container logs: %w", err)
-		}
-
-		// Call the callback for each log entry
-		for _, logEntry := range logs.Logs {
-			if err := callback(&logEntry); err != nil {
-				return fmt.Errorf("callback error: %w", err)
-			}
-		}
-
-		// If there are no more logs or we have a cursor, continue polling
-		if !logs.HasMore && logs.NextCursor == "" {
-			break
-		}
-
-		// Update cursor for next request
-		if logs.NextCursor != "" {
-			opts.Cursor = logs.NextCursor
-			endpoint, err = buildLogEndpoint(deploymentID, containerID, opts)
-			if err != nil {
-				return err
-			}
-		}
-
-		// Wait a bit before next poll to avoid overwhelming the API
-		time.Sleep(2 * time.Second)
-	}
-
-	return nil
-}
-
-// RestartContainer restarts a specific container (if supported by the API)
-func (c *Client) RestartContainer(deploymentID, containerID string) error {
-	if deploymentID == "" {
-		return fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return fmt.Errorf("container ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/container/%s/restart", deploymentID, containerID)
-
-	_, err := c.makeRequest("POST", endpoint, nil)
-	if err != nil {
-		return fmt.Errorf("failed to restart container: %w", err)
-	}
-
-	return nil
-}
-
-// StopContainer stops a specific container (if supported by the API)
-func (c *Client) StopContainer(deploymentID, containerID string) error {
-	if deploymentID == "" {
-		return fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return fmt.Errorf("container ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/container/%s/stop", deploymentID, containerID)
-
-	_, err := c.makeRequest("POST", endpoint, nil)
-	if err != nil {
-		return fmt.Errorf("failed to stop container: %w", err)
-	}
-
-	return nil
-}
-
-// ExecuteInContainer executes a command in a specific container (if supported by the API)
-func (c *Client) ExecuteInContainer(deploymentID, containerID string, command []string) (string, error) {
-	if deploymentID == "" {
-		return "", fmt.Errorf("deployment ID cannot be empty")
-	}
-	if containerID == "" {
-		return "", fmt.Errorf("container ID cannot be empty")
-	}
-	if len(command) == 0 {
-		return "", fmt.Errorf("command cannot be empty")
-	}
-
-	reqBody := map[string]interface{}{
-		"command": command,
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/container/%s/exec", deploymentID, containerID)
-
-	resp, err := c.makeRequest("POST", endpoint, reqBody)
-	if err != nil {
-		return "", fmt.Errorf("failed to execute command in container: %w", err)
-	}
-
-	var result map[string]interface{}
-	if err := json.Unmarshal(resp.Body, &result); err != nil {
-		return "", fmt.Errorf("failed to parse execution result: %w", err)
-	}
-
-	if output, ok := result["output"].(string); ok {
-		return output, nil
-	}
-
-	return string(resp.Body), nil
-}
--- a/pkg/ionet/deployment.go
+++ b/pkg/ionet/deployment.go
@@ -1,377 +0,0 @@
-package ionet
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/samber/lo"
-)
-
-// DeployContainer deploys a new container with the specified configuration
-func (c *Client) DeployContainer(req *DeploymentRequest) (*DeploymentResponse, error) {
-	if req == nil {
-		return nil, fmt.Errorf("deployment request cannot be nil")
-	}
-
-	// Validate required fields
-	if req.ResourcePrivateName == "" {
-		return nil, fmt.Errorf("resource_private_name is required")
-	}
-	if len(req.LocationIDs) == 0 {
-		return nil, fmt.Errorf("location_ids is required")
-	}
-	if req.HardwareID <= 0 {
-		return nil, fmt.Errorf("hardware_id is required")
-	}
-	if req.RegistryConfig.ImageURL == "" {
-		return nil, fmt.Errorf("registry_config.image_url is required")
-	}
-	if req.GPUsPerContainer < 1 {
-		return nil, fmt.Errorf("gpus_per_container must be at least 1")
-	}
-	if req.DurationHours < 1 {
-		return nil, fmt.Errorf("duration_hours must be at least 1")
-	}
-	if req.ContainerConfig.ReplicaCount < 1 {
-		return nil, fmt.Errorf("container_config.replica_count must be at least 1")
-	}
-
-	resp, err := c.makeRequest("POST", "/deploy", req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to deploy container: %w", err)
-	}
-
-	// API returns direct format:
-	// {"status": "string", "deployment_id": "..."}
-	var deployResp DeploymentResponse
-	if err := json.Unmarshal(resp.Body, &deployResp); err != nil {
-		return nil, fmt.Errorf("failed to parse deployment response: %w", err)
-	}
-
-	return &deployResp, nil
-}
-
-// ListDeployments retrieves a list of deployments with optional filtering
-func (c *Client) ListDeployments(opts *ListDeploymentsOptions) (*DeploymentList, error) {
-	params := make(map[string]interface{})
-
-	if opts != nil {
-		params["status"] = opts.Status
-		params["location_id"] = opts.LocationID
-		params["page"] = opts.Page
-		params["page_size"] = opts.PageSize
-		params["sort_by"] = opts.SortBy
-		params["sort_order"] = opts.SortOrder
-	}
-
-	endpoint := "/deployments" + buildQueryParams(params)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to list deployments: %w", err)
-	}
-
-	var deploymentList DeploymentList
-	if err := decodeData(resp.Body, &deploymentList); err != nil {
-		return nil, fmt.Errorf("failed to parse deployments list: %w", err)
-	}
-
-	deploymentList.Deployments = lo.Map(deploymentList.Deployments, func(deployment Deployment, _ int) Deployment {
-		deployment.GPUCount = deployment.HardwareQuantity
-		deployment.Replicas = deployment.HardwareQuantity // Assuming 1:1 mapping for now
-		return deployment
-	})
-
-	return &deploymentList, nil
-}
-
-// GetDeployment retrieves detailed information about a specific deployment
-func (c *Client) GetDeployment(deploymentID string) (*DeploymentDetail, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s", deploymentID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get deployment details: %w", err)
-	}
-
-	var deploymentDetail DeploymentDetail
-	if err := decodeDataWithFlexibleTimes(resp.Body, &deploymentDetail); err != nil {
-		return nil, fmt.Errorf("failed to parse deployment details: %w", err)
-	}
-
-	return &deploymentDetail, nil
-}
-
-// UpdateDeployment updates the configuration of an existing deployment
-func (c *Client) UpdateDeployment(deploymentID string, req *UpdateDeploymentRequest) (*UpdateDeploymentResponse, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-	if req == nil {
-		return nil, fmt.Errorf("update request cannot be nil")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s", deploymentID)
-
-	resp, err := c.makeRequest("PATCH", endpoint, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to update deployment: %w", err)
-	}
-
-	// API returns direct format:
-	// {"status": "string", "deployment_id": "..."}
-	var updateResp UpdateDeploymentResponse
-	if err := json.Unmarshal(resp.Body, &updateResp); err != nil {
-		return nil, fmt.Errorf("failed to parse update deployment response: %w", err)
-	}
-
-	return &updateResp, nil
-}
-
-// ExtendDeployment extends the duration of an existing deployment
-func (c *Client) ExtendDeployment(deploymentID string, req *ExtendDurationRequest) (*DeploymentDetail, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-	if req == nil {
-		return nil, fmt.Errorf("extend request cannot be nil")
-	}
-	if req.DurationHours < 1 {
-		return nil, fmt.Errorf("duration_hours must be at least 1")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s/extend", deploymentID)
-
-	resp, err := c.makeRequest("POST", endpoint, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to extend deployment: %w", err)
-	}
-
-	var deploymentDetail DeploymentDetail
-	if err := decodeDataWithFlexibleTimes(resp.Body, &deploymentDetail); err != nil {
-		return nil, fmt.Errorf("failed to parse extended deployment details: %w", err)
-	}
-
-	return &deploymentDetail, nil
-}
-
-// DeleteDeployment deletes an active deployment
-func (c *Client) DeleteDeployment(deploymentID string) (*UpdateDeploymentResponse, error) {
-	if deploymentID == "" {
-		return nil, fmt.Errorf("deployment ID cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/deployment/%s", deploymentID)
-
-	resp, err := c.makeRequest("DELETE", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to delete deployment: %w", err)
-	}
-
-	// API returns direct format:
-	// {"status": "string", "deployment_id": "..."}
-	var deleteResp UpdateDeploymentResponse
-	if err := json.Unmarshal(resp.Body, &deleteResp); err != nil {
-		return nil, fmt.Errorf("failed to parse delete deployment response: %w", err)
-	}
-
-	return &deleteResp, nil
-}
-
-// GetPriceEstimation calculates the estimated cost for a deployment
-func (c *Client) GetPriceEstimation(req *PriceEstimationRequest) (*PriceEstimationResponse, error) {
-	if req == nil {
-		return nil, fmt.Errorf("price estimation request cannot be nil")
-	}
-
-	// Validate required fields
-	if len(req.LocationIDs) == 0 {
-		return nil, fmt.Errorf("location_ids is required")
-	}
-	if req.HardwareID == 0 {
-		return nil, fmt.Errorf("hardware_id is required")
-	}
-	if req.ReplicaCount < 1 {
-		return nil, fmt.Errorf("replica_count must be at least 1")
-	}
-
-	currency := strings.TrimSpace(req.Currency)
-	if currency == "" {
-		currency = "usdc"
-	}
-
-	durationType := strings.TrimSpace(req.DurationType)
-	if durationType == "" {
-		durationType = "hour"
-	}
-	durationType = strings.ToLower(durationType)
-
-	apiDurationType := ""
-
-	durationQty := req.DurationQty
-	if durationQty < 1 {
-		durationQty = req.DurationHours
-	}
-	if durationQty < 1 {
-		return nil, fmt.Errorf("duration_qty must be at least 1")
-	}
-
-	hardwareQty := req.HardwareQty
-	if hardwareQty < 1 {
-		hardwareQty = req.GPUsPerContainer
-	}
-	if hardwareQty < 1 {
-		return nil, fmt.Errorf("hardware_qty must be at least 1")
-	}
-
-	durationHoursForRate := req.DurationHours
-	if durationHoursForRate < 1 {
-		durationHoursForRate = durationQty
-	}
-	switch durationType {
-	case "hour", "hours", "hourly":
-		durationHoursForRate = durationQty
-		apiDurationType = "hourly"
-	case "day", "days", "daily":
-		durationHoursForRate = durationQty * 24
-		apiDurationType = "daily"
-	case "week", "weeks", "weekly":
-		durationHoursForRate = durationQty * 24 * 7
-		apiDurationType = "weekly"
-	case "month", "months", "monthly":
-		durationHoursForRate = durationQty * 24 * 30
-		apiDurationType = "monthly"
-	}
-	if durationHoursForRate < 1 {
-		durationHoursForRate = 1
-	}
-	if apiDurationType == "" {
-		apiDurationType = "hourly"
-	}
-
-	params := map[string]interface{}{
-		"location_ids":       req.LocationIDs,
-		"hardware_id":        req.HardwareID,
-		"hardware_qty":       hardwareQty,
-		"gpus_per_container": req.GPUsPerContainer,
-		"duration_type":      apiDurationType,
-		"duration_qty":       durationQty,
-		"duration_hours":     req.DurationHours,
-		"replica_count":      req.ReplicaCount,
-		"currency":           currency,
-	}
-
-	endpoint := "/price" + buildQueryParams(params)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get price estimation: %w", err)
-	}
-
-	// Parse according to the actual API response format from docs:
-	// {
-	//   "data": {
-	//     "replica_count": 0,
-	//     "gpus_per_container": 0,
-	//     "available_replica_count": [0],
-	//     "discount": 0,
-	//     "ionet_fee": 0,
-	//     "ionet_fee_percent": 0,
-	//     "currency_conversion_fee": 0,
-	//     "currency_conversion_fee_percent": 0,
-	//     "total_cost_usdc": 0
-	//   }
-	// }
-	var pricingData struct {
-		ReplicaCount                 int     `json:"replica_count"`
-		GPUsPerContainer             int     `json:"gpus_per_container"`
-		AvailableReplicaCount        []int   `json:"available_replica_count"`
-		Discount                     float64 `json:"discount"`
-		IonetFee                     float64 `json:"ionet_fee"`
-		IonetFeePercent              float64 `json:"ionet_fee_percent"`
-		CurrencyConversionFee        float64 `json:"currency_conversion_fee"`
-		CurrencyConversionFeePercent float64 `json:"currency_conversion_fee_percent"`
-		TotalCostUSDC                float64 `json:"total_cost_usdc"`
-	}
-
-	if err := decodeData(resp.Body, &pricingData); err != nil {
-		return nil, fmt.Errorf("failed to parse price estimation response: %w", err)
-	}
-
-	// Convert to our internal format
-	durationHoursFloat := float64(durationHoursForRate)
-	if durationHoursFloat <= 0 {
-		durationHoursFloat = 1
-	}
-
-	priceResp := &PriceEstimationResponse{
-		EstimatedCost:   pricingData.TotalCostUSDC,
-		Currency:        strings.ToUpper(currency),
-		EstimationValid: true,
-		PriceBreakdown: PriceBreakdown{
-			ComputeCost: pricingData.TotalCostUSDC - pricingData.IonetFee - pricingData.CurrencyConversionFee,
-			TotalCost:   pricingData.TotalCostUSDC,
-			HourlyRate:  pricingData.TotalCostUSDC / durationHoursFloat,
-		},
-	}
-
-	return priceResp, nil
-}
-
-// CheckClusterNameAvailability checks if a cluster name is available
-func (c *Client) CheckClusterNameAvailability(clusterName string) (bool, error) {
-	if clusterName == "" {
-		return false, fmt.Errorf("cluster name cannot be empty")
-	}
-
-	params := map[string]interface{}{
-		"cluster_name": clusterName,
-	}
-
-	endpoint := "/clusters/check_cluster_name_availability" + buildQueryParams(params)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return false, fmt.Errorf("failed to check cluster name availability: %w", err)
-	}
-
-	var availabilityResp bool
-	if err := json.Unmarshal(resp.Body, &availabilityResp); err != nil {
-		return false, fmt.Errorf("failed to parse cluster name availability response: %w", err)
-	}
-
-	return availabilityResp, nil
-}
-
-// UpdateClusterName updates the name of an existing cluster/deployment
-func (c *Client) UpdateClusterName(clusterID string, req *UpdateClusterNameRequest) (*UpdateClusterNameResponse, error) {
-	if clusterID == "" {
-		return nil, fmt.Errorf("cluster ID cannot be empty")
-	}
-	if req == nil {
-		return nil, fmt.Errorf("update cluster name request cannot be nil")
-	}
-	if req.Name == "" {
-		return nil, fmt.Errorf("cluster name cannot be empty")
-	}
-
-	endpoint := fmt.Sprintf("/clusters/%s/update-name", clusterID)
-
-	resp, err := c.makeRequest("PUT", endpoint, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to update cluster name: %w", err)
-	}
-
-	// Parse the response directly without data wrapper based on API docs
-	var updateResp UpdateClusterNameResponse
-	if err := json.Unmarshal(resp.Body, &updateResp); err != nil {
-		return nil, fmt.Errorf("failed to parse update cluster name response: %w", err)
-	}
-
-	return &updateResp, nil
-}
--- a/pkg/ionet/hardware.go
+++ b/pkg/ionet/hardware.go
@@ -1,202 +0,0 @@
-package ionet
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/samber/lo"
-)
-
-// GetAvailableReplicas retrieves available replicas per location for specified hardware
-func (c *Client) GetAvailableReplicas(hardwareID int, gpuCount int) (*AvailableReplicasResponse, error) {
-	if hardwareID <= 0 {
-		return nil, fmt.Errorf("hardware_id must be greater than 0")
-	}
-	if gpuCount < 1 {
-		return nil, fmt.Errorf("gpu_count must be at least 1")
-	}
-
-	params := map[string]interface{}{
-		"hardware_id":  hardwareID,
-		"hardware_qty": gpuCount,
-	}
-
-	endpoint := "/available-replicas" + buildQueryParams(params)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get available replicas: %w", err)
-	}
-
-	type availableReplicaPayload struct {
-		ID                int    `json:"id"`
-		ISO2              string `json:"iso2"`
-		Name              string `json:"name"`
-		AvailableReplicas int    `json:"available_replicas"`
-	}
-	var payload []availableReplicaPayload
-
-	if err := decodeData(resp.Body, &payload); err != nil {
-		return nil, fmt.Errorf("failed to parse available replicas response: %w", err)
-	}
-
-	replicas := lo.Map(payload, func(item availableReplicaPayload, _ int) AvailableReplica {
-		return AvailableReplica{
-			LocationID:     item.ID,
-			LocationName:   item.Name,
-			HardwareID:     hardwareID,
-			HardwareName:   "",
-			AvailableCount: item.AvailableReplicas,
-			MaxGPUs:        gpuCount,
-		}
-	})
-
-	return &AvailableReplicasResponse{Replicas: replicas}, nil
-}
-
-// GetMaxGPUsPerContainer retrieves the maximum number of GPUs available per hardware type
-func (c *Client) GetMaxGPUsPerContainer() (*MaxGPUResponse, error) {
-	resp, err := c.makeRequest("GET", "/hardware/max-gpus-per-container", nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get max GPUs per container: %w", err)
-	}
-
-	var maxGPUResp MaxGPUResponse
-	if err := decodeData(resp.Body, &maxGPUResp); err != nil {
-		return nil, fmt.Errorf("failed to parse max GPU response: %w", err)
-	}
-
-	return &maxGPUResp, nil
-}
-
-// ListHardwareTypes retrieves available hardware types using the max GPUs endpoint
-func (c *Client) ListHardwareTypes() ([]HardwareType, int, error) {
-	maxGPUResp, err := c.GetMaxGPUsPerContainer()
-	if err != nil {
-		return nil, 0, fmt.Errorf("failed to list hardware types: %w", err)
-	}
-
-	mapped := lo.Map(maxGPUResp.Hardware, func(hw MaxGPUInfo, _ int) HardwareType {
-		name := strings.TrimSpace(hw.HardwareName)
-		if name == "" {
-			name = fmt.Sprintf("Hardware %d", hw.HardwareID)
-		}
-
-		return HardwareType{
-			ID:             hw.HardwareID,
-			Name:           name,
-			GPUType:        "",
-			GPUMemory:      0,
-			MaxGPUs:        hw.MaxGPUsPerContainer,
-			CPU:            "",
-			Memory:         0,
-			Storage:        0,
-			HourlyRate:     0,
-			Available:      hw.Available > 0,
-			BrandName:      strings.TrimSpace(hw.BrandName),
-			AvailableCount: hw.Available,
-		}
-	})
-
-	totalAvailable := maxGPUResp.Total
-	if totalAvailable == 0 {
-		totalAvailable = lo.SumBy(maxGPUResp.Hardware, func(hw MaxGPUInfo) int {
-			return hw.Available
-		})
-	}
-
-	return mapped, totalAvailable, nil
-}
-
-// ListLocations retrieves available deployment locations (if supported by the API)
-func (c *Client) ListLocations() (*LocationsResponse, error) {
-	resp, err := c.makeRequest("GET", "/locations", nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to list locations: %w", err)
-	}
-
-	var locations LocationsResponse
-	if err := decodeData(resp.Body, &locations); err != nil {
-		return nil, fmt.Errorf("failed to parse locations response: %w", err)
-	}
-
-	locations.Locations = lo.Map(locations.Locations, func(location Location, _ int) Location {
-		location.ISO2 = strings.ToUpper(strings.TrimSpace(location.ISO2))
-		return location
-	})
-
-	if locations.Total == 0 {
-		locations.Total = lo.SumBy(locations.Locations, func(location Location) int {
-			return location.Available
-		})
-	}
-
-	return &locations, nil
-}
-
-// GetHardwareType retrieves details about a specific hardware type
-func (c *Client) GetHardwareType(hardwareID int) (*HardwareType, error) {
-	if hardwareID <= 0 {
-		return nil, fmt.Errorf("hardware ID must be greater than 0")
-	}
-
-	endpoint := fmt.Sprintf("/hardware/types/%d", hardwareID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get hardware type: %w", err)
-	}
-
-	// API response format not documented, assuming direct format
-	var hardwareType HardwareType
-	if err := json.Unmarshal(resp.Body, &hardwareType); err != nil {
-		return nil, fmt.Errorf("failed to parse hardware type: %w", err)
-	}
-
-	return &hardwareType, nil
-}
-
-// GetLocation retrieves details about a specific location
-func (c *Client) GetLocation(locationID int) (*Location, error) {
-	if locationID <= 0 {
-		return nil, fmt.Errorf("location ID must be greater than 0")
-	}
-
-	endpoint := fmt.Sprintf("/locations/%d", locationID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get location: %w", err)
-	}
-
-	// API response format not documented, assuming direct format
-	var location Location
-	if err := json.Unmarshal(resp.Body, &location); err != nil {
-		return nil, fmt.Errorf("failed to parse location: %w", err)
-	}
-
-	return &location, nil
-}
-
-// GetLocationAvailability retrieves real-time availability for a specific location
-func (c *Client) GetLocationAvailability(locationID int) (*LocationAvailability, error) {
-	if locationID <= 0 {
-		return nil, fmt.Errorf("location ID must be greater than 0")
-	}
-
-	endpoint := fmt.Sprintf("/locations/%d/availability", locationID)
-
-	resp, err := c.makeRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get location availability: %w", err)
-	}
-
-	// API response format not documented, assuming direct format
-	var availability LocationAvailability
-	if err := json.Unmarshal(resp.Body, &availability); err != nil {
-		return nil, fmt.Errorf("failed to parse location availability: %w", err)
-	}
-
-	return &availability, nil
-}
--- a/pkg/ionet/jsonutil.go
+++ b/pkg/ionet/jsonutil.go
@@ -1,96 +0,0 @@
-package ionet
-
-import (
-	"encoding/json"
-	"strings"
-	"time"
-
-	"github.com/samber/lo"
-)
-
-// decodeWithFlexibleTimes unmarshals API responses while tolerating timestamp strings
-// that omit timezone information by normalizing them to RFC3339Nano.
-func decodeWithFlexibleTimes(data []byte, target interface{}) error {
-	var intermediate interface{}
-	if err := json.Unmarshal(data, &intermediate); err != nil {
-		return err
-	}
-
-	normalized := normalizeTimeValues(intermediate)
-	reencoded, err := json.Marshal(normalized)
-	if err != nil {
-		return err
-	}
-
-	return json.Unmarshal(reencoded, target)
-}
-
-func decodeData[T any](data []byte, target *T) error {
-	var wrapper struct {
-		Data T `json:"data"`
-	}
-	if err := json.Unmarshal(data, &wrapper); err != nil {
-		return err
-	}
-	*target = wrapper.Data
-	return nil
-}
-
-func decodeDataWithFlexibleTimes[T any](data []byte, target *T) error {
-	var wrapper struct {
-		Data T `json:"data"`
-	}
-	if err := decodeWithFlexibleTimes(data, &wrapper); err != nil {
-		return err
-	}
-	*target = wrapper.Data
-	return nil
-}
-
-func normalizeTimeValues(value interface{}) interface{} {
-	switch v := value.(type) {
-	case map[string]interface{}:
-		return lo.MapValues(v, func(val interface{}, _ string) interface{} {
-			return normalizeTimeValues(val)
-		})
-	case []interface{}:
-		return lo.Map(v, func(item interface{}, _ int) interface{} {
-			return normalizeTimeValues(item)
-		})
-	case string:
-		if normalized, changed := normalizeTimeString(v); changed {
-			return normalized
-		}
-		return v
-	default:
-		return value
-	}
-}
-
-func normalizeTimeString(input string) (string, bool) {
-	trimmed := strings.TrimSpace(input)
-	if trimmed == "" {
-		return input, false
-	}
-
-	if _, err := time.Parse(time.RFC3339Nano, trimmed); err == nil {
-		return trimmed, trimmed != input
-	}
-	if _, err := time.Parse(time.RFC3339, trimmed); err == nil {
-		return trimmed, trimmed != input
-	}
-
-	layouts := []string{
-		"2006-01-02T15:04:05.999999999",
-		"2006-01-02T15:04:05.999999",
-		"2006-01-02T15:04:05",
-	}
-
-	for _, layout := range layouts {
-		if parsed, err := time.Parse(layout, trimmed); err == nil {
-			return parsed.UTC().Format(time.RFC3339Nano), true
-		}
-	}
-
-	return input, false
-}
--- a/pkg/ionet/types.go
+++ b/pkg/ionet/types.go
@@ -1,353 +0,0 @@
-package ionet
-
-import (
-	"time"
-)
-
-// Client represents the IO.NET API client
-type Client struct {
-	BaseURL    string
-	APIKey     string
-	HTTPClient HTTPClient
-}
-
-// HTTPClient interface for making HTTP requests
-type HTTPClient interface {
-	Do(req *HTTPRequest) (*HTTPResponse, error)
-}
-
-// HTTPRequest represents an HTTP request
-type HTTPRequest struct {
-	Method  string
-	URL     string
-	Headers map[string]string
-	Body    []byte
-}
-
-// HTTPResponse represents an HTTP response
-type HTTPResponse struct {
-	StatusCode int
-	Headers    map[string]string
-	Body       []byte
-}
-
-// DeploymentRequest represents a container deployment request
-type DeploymentRequest struct {
-	ResourcePrivateName string          `json:"resource_private_name"`
-	DurationHours       int             `json:"duration_hours"`
-	GPUsPerContainer    int             `json:"gpus_per_container"`
-	HardwareID          int             `json:"hardware_id"`
-	LocationIDs         []int           `json:"location_ids"`
-	ContainerConfig     ContainerConfig `json:"container_config"`
-	RegistryConfig      RegistryConfig  `json:"registry_config"`
-}
-
-// ContainerConfig represents container configuration
-type ContainerConfig struct {
-	ReplicaCount       int               `json:"replica_count"`
-	EnvVariables       map[string]string `json:"env_variables,omitempty"`
-	SecretEnvVariables map[string]string `json:"secret_env_variables,omitempty"`
-	Entrypoint         []string          `json:"entrypoint,omitempty"`
-	TrafficPort        int               `json:"traffic_port,omitempty"`
-	Args               []string          `json:"args,omitempty"`
-}
-
-// RegistryConfig represents registry configuration
-type RegistryConfig struct {
-	ImageURL         string `json:"image_url"`
-	RegistryUsername string `json:"registry_username,omitempty"`
-	RegistrySecret   string `json:"registry_secret,omitempty"`
-}
-
-// DeploymentResponse represents the response from deployment creation
-type DeploymentResponse struct {
-	DeploymentID string `json:"deployment_id"`
-	Status       string `json:"status"`
-}
-
-// DeploymentDetail represents detailed deployment information
-type DeploymentDetail struct {
-	ID                      string                    `json:"id"`
-	Status                  string                    `json:"status"`
-	CreatedAt               time.Time                 `json:"created_at"`
-	StartedAt               *time.Time                `json:"started_at,omitempty"`
-	FinishedAt              *time.Time                `json:"finished_at,omitempty"`
-	AmountPaid              float64                   `json:"amount_paid"`
-	CompletedPercent        float64                   `json:"completed_percent"`
-	TotalGPUs               int                       `json:"total_gpus"`
-	GPUsPerContainer        int                       `json:"gpus_per_container"`
-	TotalContainers         int                       `json:"total_containers"`
-	HardwareName            string                    `json:"hardware_name"`
-	HardwareID              int                       `json:"hardware_id"`
-	Locations               []DeploymentLocation      `json:"locations"`
-	BrandName               string                    `json:"brand_name"`
-	ComputeMinutesServed    int                       `json:"compute_minutes_served"`
-	ComputeMinutesRemaining int                       `json:"compute_minutes_remaining"`
-	ContainerConfig         DeploymentContainerConfig `json:"container_config"`
-}
-
-// DeploymentLocation represents a location in deployment details
-type DeploymentLocation struct {
-	ID   int    `json:"id"`
-	ISO2 string `json:"iso2"`
-	Name string `json:"name"`
-}
-
-// DeploymentContainerConfig represents container config in deployment details
-type DeploymentContainerConfig struct {
-	Entrypoint   []string               `json:"entrypoint"`
-	EnvVariables map[string]interface{} `json:"env_variables"`
-	TrafficPort  int                    `json:"traffic_port"`
-	ImageURL     string                 `json:"image_url"`
-}
-
-// Container represents a container within a deployment
-type Container struct {
-	DeviceID         string           `json:"device_id"`
-	ContainerID      string           `json:"container_id"`
-	Hardware         string           `json:"hardware"`
-	BrandName        string           `json:"brand_name"`
-	CreatedAt        time.Time        `json:"created_at"`
-	UptimePercent    int              `json:"uptime_percent"`
-	GPUsPerContainer int              `json:"gpus_per_container"`
-	Status           string           `json:"status"`
-	ContainerEvents  []ContainerEvent `json:"container_events"`
-	PublicURL        string           `json:"public_url"`
-}
-
-// ContainerEvent represents a container event
-type ContainerEvent struct {
-	Time    time.Time `json:"time"`
-	Message string    `json:"message"`
-}
-
-// ContainerList represents a list of containers
-type ContainerList struct {
-	Total   int         `json:"total"`
-	Workers []Container `json:"workers"`
-}
-
-// Deployment represents a deployment in the list
-type Deployment struct {
-	ID                      string    `json:"id"`
-	Status                  string    `json:"status"`
-	Name                    string    `json:"name"`
-	CompletedPercent        float64   `json:"completed_percent"`
-	HardwareQuantity        int       `json:"hardware_quantity"`
-	BrandName               string    `json:"brand_name"`
-	HardwareName            string    `json:"hardware_name"`
-	Served                  string    `json:"served"`
-	Remaining               string    `json:"remaining"`
-	ComputeMinutesServed    int       `json:"compute_minutes_served"`
-	ComputeMinutesRemaining int       `json:"compute_minutes_remaining"`
-	CreatedAt               time.Time `json:"created_at"`
-	GPUCount                int       `json:"-"` // Derived from HardwareQuantity
-	Replicas                int       `json:"-"` // Derived from HardwareQuantity
-}
-
-// DeploymentList represents a list of deployments with pagination
-type DeploymentList struct {
-	Deployments []Deployment `json:"deployments"`
-	Total       int          `json:"total"`
-	Statuses    []string     `json:"statuses"`
-}
-
-// AvailableReplica represents replica availability for a location
-type AvailableReplica struct {
-	LocationID     int    `json:"location_id"`
-	LocationName   string `json:"location_name"`
-	HardwareID     int    `json:"hardware_id"`
-	HardwareName   string `json:"hardware_name"`
-	AvailableCount int    `json:"available_count"`
-	MaxGPUs        int    `json:"max_gpus"`
-}
-
-// AvailableReplicasResponse represents the response for available replicas
-type AvailableReplicasResponse struct {
-	Replicas []AvailableReplica `json:"replicas"`
-}
-
-// MaxGPUResponse represents the response for maximum GPUs per container
-type MaxGPUResponse struct {
-	Hardware []MaxGPUInfo `json:"hardware"`
-	Total    int          `json:"total"`
-}
-
-// MaxGPUInfo represents max GPU information for a hardware type
-type MaxGPUInfo struct {
-	MaxGPUsPerContainer int    `json:"max_gpus_per_container"`
-	Available           int    `json:"available"`
-	HardwareID          int    `json:"hardware_id"`
-	HardwareName        string `json:"hardware_name"`
-	BrandName           string `json:"brand_name"`
-}
-
-// PriceEstimationRequest represents a price estimation request
-type PriceEstimationRequest struct {
-	LocationIDs      []int  `json:"location_ids"`
-	HardwareID       int    `json:"hardware_id"`
-	GPUsPerContainer int    `json:"gpus_per_container"`
-	DurationHours    int    `json:"duration_hours"`
-	ReplicaCount     int    `json:"replica_count"`
-	Currency         string `json:"currency"`
-	DurationType     string `json:"duration_type"`
-	DurationQty      int    `json:"duration_qty"`
-	HardwareQty      int    `json:"hardware_qty"`
-}
-
-// PriceEstimationResponse represents the price estimation response
-type PriceEstimationResponse struct {
-	EstimatedCost   float64        `json:"estimated_cost"`
-	Currency        string         `json:"currency"`
-	PriceBreakdown  PriceBreakdown `json:"price_breakdown"`
-	EstimationValid bool           `json:"estimation_valid"`
-}
-
-// PriceBreakdown represents detailed cost breakdown
-type PriceBreakdown struct {
-	ComputeCost float64 `json:"compute_cost"`
-	NetworkCost float64 `json:"network_cost,omitempty"`
-	StorageCost float64 `json:"storage_cost,omitempty"`
-	TotalCost   float64 `json:"total_cost"`
-	HourlyRate  float64 `json:"hourly_rate"`
-}
-
-// ContainerLogs represents container log entries
-type ContainerLogs struct {
-	ContainerID string     `json:"container_id"`
-	Logs        []LogEntry `json:"logs"`
-	HasMore     bool       `json:"has_more"`
-	NextCursor  string     `json:"next_cursor,omitempty"`
-}
-
-// LogEntry represents a single log entry
-type LogEntry struct {
-	Timestamp time.Time `json:"timestamp"`
-	Level     string    `json:"level,omitempty"`
-	Message   string    `json:"message"`
-	Source    string    `json:"source,omitempty"`
-}
-
-// UpdateDeploymentRequest represents request to update deployment configuration
-type UpdateDeploymentRequest struct {
-	EnvVariables       map[string]string `json:"env_variables,omitempty"`
-	SecretEnvVariables map[string]string `json:"secret_env_variables,omitempty"`
-	Entrypoint         []string          `json:"entrypoint,omitempty"`
-	TrafficPort        *int              `json:"traffic_port,omitempty"`
-	ImageURL           string            `json:"image_url,omitempty"`
-	RegistryUsername   string            `json:"registry_username,omitempty"`
-	RegistrySecret     string            `json:"registry_secret,omitempty"`
-	Args               []string          `json:"args,omitempty"`
-	Command            string            `json:"command,omitempty"`
-}
-
-// ExtendDurationRequest represents request to extend deployment duration
-type ExtendDurationRequest struct {
-	DurationHours int `json:"duration_hours"`
-}
-
-// UpdateDeploymentResponse represents response from deployment update
-type UpdateDeploymentResponse struct {
-	Status       string `json:"status"`
-	DeploymentID string `json:"deployment_id"`
-}
-
-// UpdateClusterNameRequest represents request to update cluster name
-type UpdateClusterNameRequest struct {
-	Name string `json:"cluster_name"`
-}
-
-// UpdateClusterNameResponse represents response from cluster name update
-type UpdateClusterNameResponse struct {
-	Status  string `json:"status"`
-	Message string `json:"message"`
-}
-
-// APIError represents an API error response
-type APIError struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-	Details string `json:"details,omitempty"`
-}
-
-// Error implements the error interface
-func (e *APIError) Error() string {
-	if e.Details != "" {
-		return e.Message + ": " + e.Details
-	}
-	return e.Message
-}
-
-// ListDeploymentsOptions represents options for listing deployments
-type ListDeploymentsOptions struct {
-	Status     string `json:"status,omitempty"`      // filter by status
-	LocationID int    `json:"location_id,omitempty"` // filter by location
-	Page       int    `json:"page,omitempty"`        // pagination
-	PageSize   int    `json:"page_size,omitempty"`   // pagination
-	SortBy     string `json:"sort_by,omitempty"`     // sort field
-	SortOrder  string `json:"sort_order,omitempty"`  // asc/desc
-}
-
-// GetLogsOptions represents options for retrieving container logs
-type GetLogsOptions struct {
-	StartTime *time.Time `json:"start_time,omitempty"`
-	EndTime   *time.Time `json:"end_time,omitempty"`
-	Level     string     `json:"level,omitempty"`  // filter by log level
-	Stream    string     `json:"stream,omitempty"` // filter by stdout/stderr streams
-	Limit     int        `json:"limit,omitempty"`  // max number of log entries
-	Cursor    string     `json:"cursor,omitempty"` // pagination cursor
-	Follow    bool       `json:"follow,omitempty"` // stream logs
-}
-
-// HardwareType represents a hardware type available for deployment
-type HardwareType struct {
-	ID             int     `json:"id"`
-	Name           string  `json:"name"`
-	Description    string  `json:"description,omitempty"`
-	GPUType        string  `json:"gpu_type"`
-	GPUMemory      int     `json:"gpu_memory"` // in GB
-	MaxGPUs        int     `json:"max_gpus"`
-	CPU            string  `json:"cpu,omitempty"`
-	Memory         int     `json:"memory,omitempty"`  // in GB
-	Storage        int     `json:"storage,omitempty"` // in GB
-	HourlyRate     float64 `json:"hourly_rate"`
-	Available      bool    `json:"available"`
-	BrandName      string  `json:"brand_name,omitempty"`
-	AvailableCount int     `json:"available_count,omitempty"`
-}
-
-// Location represents a deployment location
-type Location struct {
-	ID          int     `json:"id"`
-	Name        string  `json:"name"`
-	ISO2        string  `json:"iso2,omitempty"`
-	Region      string  `json:"region,omitempty"`
-	Country     string  `json:"country,omitempty"`
-	Latitude    float64 `json:"latitude,omitempty"`
-	Longitude   float64 `json:"longitude,omitempty"`
-	Available   int     `json:"available,omitempty"`
-	Description string  `json:"description,omitempty"`
-}
-
-// LocationsResponse represents the list of locations and aggregated metadata.
-type LocationsResponse struct {
-	Locations []Location `json:"locations"`
-	Total     int        `json:"total"`
-}
-
-// LocationAvailability represents real-time availability for a location
-type LocationAvailability struct {
-	LocationID           int                    `json:"location_id"`
-	LocationName         string                 `json:"location_name"`
-	Available            bool                   `json:"available"`
-	HardwareAvailability []HardwareAvailability `json:"hardware_availability"`
-	UpdatedAt            time.Time              `json:"updated_at"`
-}
-
-// HardwareAvailability represents availability for specific hardware at a location
-type HardwareAvailability struct {
-	HardwareID     int    `json:"hardware_id"`
-	HardwareName   string `json:"hardware_name"`
-	AvailableCount int    `json:"available_count"`
-	MaxGPUs        int    `json:"max_gpus"`
-}
--- a/relay/audio_handler.go
+++ b/relay/audio_handler.go
@@ -67,11 +67,8 @@ func AudioHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *type
 		service.ResetStatusCode(newAPIError, statusCodeMappingStr)
 		return newAPIError
 	}
-	if usage.(*dto.Usage).CompletionTokenDetails.AudioTokens > 0 || usage.(*dto.Usage).PromptTokensDetails.AudioTokens > 0 {
-		service.PostAudioConsumeQuota(c, info, usage.(*dto.Usage), "")
-	} else {
-		postConsumeQuota(c, info, usage.(*dto.Usage))
-	}
+
+	postConsumeQuota(c, info, usage.(*dto.Usage), "")

 	return nil
 }
--- a/relay/channel/adapter.go
+++ b/relay/channel/adapter.go
@@ -47,7 +47,7 @@ type TaskAdaptor interface {
 	GetChannelName() string

 	// FetchTask
-	FetchTask(baseUrl, key string, body map[string]any, proxy string) (*http.Response, error)
+	FetchTask(baseUrl, key string, body map[string]any) (*http.Response, error)

 	ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, error)
 }
--- a/relay/channel/ali/adaptor.go
+++ b/relay/channel/ali/adaptor.go
@@ -19,22 +19,6 @@ import (
 )

 type Adaptor struct {
-	IsSyncImageModel bool
-}
-
-var syncModels = []string{
-	"z-image",
-	"qwen-image",
-	"wan2.6",
-}
-
-func isSyncImageModel(modelName string) bool {
-	for _, m := range syncModels {
-		if strings.Contains(modelName, m) {
-			return true
-		}
-	}
-	return false
 }

 func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dto.GeminiChatRequest) (any, error) {
@@ -61,16 +45,10 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 		case constant.RelayModeRerank:
 			fullRequestURL = fmt.Sprintf("%s/api/v1/services/rerank/text-rerank/text-rerank", info.ChannelBaseUrl)
 		case constant.RelayModeImagesGenerations:
-			if isSyncImageModel(info.OriginModelName) {
-				fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/multimodal-generation/generation", info.ChannelBaseUrl)
-			} else {
-				fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/text2image/image-synthesis", info.ChannelBaseUrl)
-			}
+			fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/text2image/image-synthesis", info.ChannelBaseUrl)
 		case constant.RelayModeImagesEdits:
-			if isOldWanModel(info.OriginModelName) {
+			if isWanModel(info.OriginModelName) {
 				fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/image2image/image-synthesis", info.ChannelBaseUrl)
-			} else if isWanModel(info.OriginModelName) {
-				fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/image-generation/generation", info.ChannelBaseUrl)
 			} else {
 				fullRequestURL = fmt.Sprintf("%s/api/v1/services/aigc/multimodal-generation/generation", info.ChannelBaseUrl)
 			}
@@ -94,11 +72,7 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *rel
 		req.Set("X-DashScope-Plugin", c.GetString("plugin"))
 	}
 	if info.RelayMode == constant.RelayModeImagesGenerations {
-		if isSyncImageModel(info.OriginModelName) {
-
-		} else {
-			req.Set("X-DashScope-Async", "enable")
-		}
+		req.Set("X-DashScope-Async", "enable")
 	}
 	if info.RelayMode == constant.RelayModeImagesEdits {
 		if isWanModel(info.OriginModelName) {
@@ -134,25 +108,15 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn

 func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
 	if info.RelayMode == constant.RelayModeImagesGenerations {
-		if isSyncImageModel(info.OriginModelName) {
-			a.IsSyncImageModel = true
-		}
-		aliRequest, err := oaiImage2AliImageRequest(info, request, a.IsSyncImageModel)
+		aliRequest, err := oaiImage2Ali(request)
 		if err != nil {
-			return nil, fmt.Errorf("convert image request to async ali image request failed: %w", err)
+			return nil, fmt.Errorf("convert image request failed: %w", err)
 		}
 		return aliRequest, nil
 	} else if info.RelayMode == constant.RelayModeImagesEdits {
-		if isOldWanModel(info.OriginModelName) {
+		if isWanModel(info.OriginModelName) {
 			return oaiFormEdit2WanxImageEdit(c, info, request)
 		}
-		if isSyncImageModel(info.OriginModelName) {
-			if isWanModel(info.OriginModelName) {
-				a.IsSyncImageModel = false
-			} else {
-				a.IsSyncImageModel = true
-			}
-		}
 		// ali image edit https://bailian.console.aliyun.com/?tab=api#/api/?type=model&url=2976416
 		// 如果用户使用表单，则需要解析表单数据
 		if strings.Contains(c.Request.Header.Get("Content-Type"), "multipart/form-data") {
@@ -162,9 +126,9 @@ func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInf
 			}
 			return aliRequest, nil
 		} else {
-			aliRequest, err := oaiImage2AliImageRequest(info, request, a.IsSyncImageModel)
+			aliRequest, err := oaiImage2Ali(request)
 			if err != nil {
-				return nil, fmt.Errorf("convert image request to async ali image request failed: %w", err)
+				return nil, fmt.Errorf("convert image request failed: %w", err)
 			}
 			return aliRequest, nil
 		}
@@ -186,7 +150,7 @@ func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInf
 }

 func (a *Adaptor) ConvertOpenAIResponsesRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.OpenAIResponsesRequest) (any, error) {
-	//TODO implement me
+	// TODO implement me
 	return nil, errors.New("not implemented")
 }

@@ -205,9 +169,13 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
 	default:
 		switch info.RelayMode {
 		case constant.RelayModeImagesGenerations:
-			err, usage = aliImageHandler(a, c, resp, info)
+			err, usage = aliImageHandler(c, resp, info)
 		case constant.RelayModeImagesEdits:
-			err, usage = aliImageHandler(a, c, resp, info)
+			if isWanModel(info.OriginModelName) {
+				err, usage = aliImageHandler(c, resp, info)
+			} else {
+				err, usage = aliImageEditHandler(c, resp, info)
+			}
 		case constant.RelayModeRerank:
 			err, usage = RerankHandler(c, resp, info)
 		default:
--- a/relay/channel/ali/dto.go
+++ b/relay/channel/ali/dto.go
@@ -1,13 +1,6 @@
 package ali

-import (
-	"strings"
-
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/logger"
-	"github.com/QuantumNous/new-api/service"
-	"github.com/gin-gonic/gin"
-)
+import "github.com/QuantumNous/new-api/dto"

 type AliMessage struct {
 	Content any    `json:"content"`
@@ -72,7 +65,6 @@ type AliUsage struct {
 	InputTokens  int `json:"input_tokens"`
 	OutputTokens int `json:"output_tokens"`
 	TotalTokens  int `json:"total_tokens"`
-	ImageCount   int `json:"image_count,omitempty"`
 }

 type TaskResult struct {
@@ -83,78 +75,14 @@ type TaskResult struct {
 }

 type AliOutput struct {
-	TaskId       string       `json:"task_id,omitempty"`
-	TaskStatus   string       `json:"task_status,omitempty"`
-	Text         string       `json:"text"`
-	FinishReason string       `json:"finish_reason"`
-	Message      string       `json:"message,omitempty"`
-	Code         string       `json:"code,omitempty"`
-	Results      []TaskResult `json:"results,omitempty"`
-	Choices      []struct {
-		FinishReason string `json:"finish_reason,omitempty"`
-		Message      struct {
-			Role             string            `json:"role,omitempty"`
-			Content          []AliMediaContent `json:"content,omitempty"`
-			ReasoningContent string            `json:"reasoning_content,omitempty"`
-		} `json:"message,omitempty"`
-	} `json:"choices,omitempty"`
-}
-
-func (o *AliOutput) ChoicesToOpenAIImageDate(c *gin.Context, responseFormat string) []dto.ImageData {
-	var imageData []dto.ImageData
-	if len(o.Choices) > 0 {
-		for _, choice := range o.Choices {
-			var data dto.ImageData
-			for _, content := range choice.Message.Content {
-				if content.Image != "" {
-					if strings.HasPrefix(content.Image, "http") {
-						var b64Json string
-						if responseFormat == "b64_json" {
-							_, b64, err := service.GetImageFromUrl(content.Image)
-							if err != nil {
-								logger.LogError(c, "get_image_data_failed: "+err.Error())
-								continue
-							}
-							b64Json = b64
-						}
-						data.Url = content.Image
-						data.B64Json = b64Json
-					} else {
-						data.B64Json = content.Image
-					}
-				} else if content.Text != "" {
-					data.RevisedPrompt = content.Text
-				}
-			}
-			imageData = append(imageData, data)
-		}
-	}
-
-	return imageData
-}
-
-func (o *AliOutput) ResultToOpenAIImageDate(c *gin.Context, responseFormat string) []dto.ImageData {
-	var imageData []dto.ImageData
-	for _, data := range o.Results {
-		var b64Json string
-		if responseFormat == "b64_json" {
-			_, b64, err := service.GetImageFromUrl(data.Url)
-			if err != nil {
-				logger.LogError(c, "get_image_data_failed: "+err.Error())
-				continue
-			}
-			b64Json = b64
-		} else {
-			b64Json = data.B64Image
-		}
-
-		imageData = append(imageData, dto.ImageData{
-			Url:           data.Url,
-			B64Json:       b64Json,
-			RevisedPrompt: "",
-		})
-	}
-	return imageData
+	TaskId       string           `json:"task_id,omitempty"`
+	TaskStatus   string           `json:"task_status,omitempty"`
+	Text         string           `json:"text"`
+	FinishReason string           `json:"finish_reason"`
+	Message      string           `json:"message,omitempty"`
+	Code         string           `json:"code,omitempty"`
+	Results      []TaskResult     `json:"results,omitempty"`
+	Choices      []map[string]any `json:"choices,omitempty"`
 }

 type AliResponse struct {
@@ -164,26 +92,18 @@ type AliResponse struct {
 }

 type AliImageRequest struct {
-	Model          string             `json:"model"`
-	Input          any                `json:"input"`
-	Parameters     AliImageParameters `json:"parameters,omitempty"`
-	ResponseFormat string             `json:"response_format,omitempty"`
+	Model          string `json:"model"`
+	Input          any    `json:"input"`
+	Parameters     any    `json:"parameters,omitempty"`
+	ResponseFormat string `json:"response_format,omitempty"`
 }

 type AliImageParameters struct {
-	Size         string `json:"size,omitempty"`
-	N            int    `json:"n,omitempty"`
-	Steps        string `json:"steps,omitempty"`
-	Scale        string `json:"scale,omitempty"`
-	Watermark    *bool  `json:"watermark,omitempty"`
-	PromptExtend *bool  `json:"prompt_extend,omitempty"`
-}
-
-func (p *AliImageParameters) PromptExtendValue() bool {
-	if p != nil && p.PromptExtend != nil {
-		return *p.PromptExtend
-	}
-	return false
+	Size      string `json:"size,omitempty"`
+	N         int    `json:"n,omitempty"`
+	Steps     string `json:"steps,omitempty"`
+	Scale     string `json:"scale,omitempty"`
+	Watermark *bool  `json:"watermark,omitempty"`
 }

 type AliImageInput struct {
--- a/relay/channel/ali/image.go
+++ b/relay/channel/ali/image.go
@@ -1,6 +1,7 @@
 package ali

 import (
+	"context"
 	"encoding/base64"
 	"errors"
 	"fmt"
@@ -20,23 +21,17 @@ import (
 	"github.com/gin-gonic/gin"
 )

-func oaiImage2AliImageRequest(info *relaycommon.RelayInfo, request dto.ImageRequest, isSync bool) (*AliImageRequest, error) {
+func oaiImage2Ali(request dto.ImageRequest) (*AliImageRequest, error) {
 	var imageRequest AliImageRequest
 	imageRequest.Model = request.Model
 	imageRequest.ResponseFormat = request.ResponseFormat
+	logger.LogJson(context.Background(), "oaiImage2Ali request extra", request.Extra)
 	if request.Extra != nil {
 		if val, ok := request.Extra["parameters"]; ok {
 			err := common.Unmarshal(val, &imageRequest.Parameters)
 			if err != nil {
 				return nil, fmt.Errorf("invalid parameters field: %w", err)
 			}
-		} else {
-			// 兼容没有parameters字段的情况，从openai标准字段中提取参数
-			imageRequest.Parameters = AliImageParameters{
-				Size:      strings.Replace(request.Size, "x", "*", -1),
-				N:         int(request.N),
-				Watermark: request.Watermark,
-			}
 		}
 		if val, ok := request.Extra["input"]; ok {
 			err := common.Unmarshal(val, &imageRequest.Input)
@@ -46,44 +41,23 @@ func oaiImage2AliImageRequest(info *relaycommon.RelayInfo, request dto.ImageRequ
 		}
 	}

-	if strings.Contains(request.Model, "z-image") {
-		// z-image 开启prompt_extend后，按2倍计费
-		if imageRequest.Parameters.PromptExtendValue() {
-			info.PriceData.AddOtherRatio("prompt_extend", 2)
+	if imageRequest.Parameters == nil {
+		imageRequest.Parameters = AliImageParameters{
+			Size:      strings.Replace(request.Size, "x", "*", -1),
+			N:         int(request.N),
+			Watermark: request.Watermark,
 		}
 	}

-	// 检查n参数
-	if imageRequest.Parameters.N != 0 {
-		info.PriceData.AddOtherRatio("n", float64(imageRequest.Parameters.N))
-	}
-
-	// 同步图片模型和异步图片模型请求格式不一样
-	if isSync {
-		if imageRequest.Input == nil {
-			imageRequest.Input = AliImageInput{
-				Messages: []AliMessage{
-					{
-						Role: "user",
-						Content: []AliMediaContent{
-							{
-								Text: request.Prompt,
-							},
-						},
-					},
-				},
-			}
-		}
-	} else {
-		if imageRequest.Input == nil {
-			imageRequest.Input = AliImageInput{
-				Prompt: request.Prompt,
-			}
+	if imageRequest.Input == nil {
+		imageRequest.Input = AliImageInput{
+			Prompt: request.Prompt,
 		}
 	}

 	return &imageRequest, nil
 }
+
 func getImageBase64sFromForm(c *gin.Context, fieldName string) ([]string, error) {
 	mf := c.Request.MultipartForm
 	if mf == nil {
@@ -225,8 +199,6 @@ func asyncTaskWait(c *gin.Context, info *relaycommon.RelayInfo, taskID string) (
 	var taskResponse AliResponse
 	var responseBody []byte

-	time.Sleep(time.Duration(5) * time.Second)
-
 	for {
 		logger.LogDebug(c, fmt.Sprintf("asyncTaskWait step %d/%d, wait %d seconds", step, maxStep, waitSeconds))
 		step++
@@ -266,17 +238,32 @@ func responseAli2OpenAIImage(c *gin.Context, response *AliResponse, originBody [
 		Created: info.StartTime.Unix(),
 	}

-	if len(response.Output.Results) > 0 {
-		imageResponse.Data = response.Output.ResultToOpenAIImageDate(c, responseFormat)
-	} else if len(response.Output.Choices) > 0 {
-		imageResponse.Data = response.Output.ChoicesToOpenAIImageDate(c, responseFormat)
-	}
+	for _, data := range response.Output.Results {
+		var b64Json string
+		if responseFormat == "b64_json" {
+			_, b64, err := service.GetImageFromUrl(data.Url)
+			if err != nil {
+				logger.LogError(c, "get_image_data_failed: "+err.Error())
+				continue
+			}
+			b64Json = b64
+		} else {
+			b64Json = data.B64Image
+		}

-	imageResponse.Metadata = originBody
+		imageResponse.Data = append(imageResponse.Data, dto.ImageData{
+			Url:           data.Url,
+			B64Json:       b64Json,
+			RevisedPrompt: "",
+		})
+	}
+	var mapResponse map[string]any
+	_ = common.Unmarshal(originBody, &mapResponse)
+	imageResponse.Extra = mapResponse
 	return &imageResponse
 }

-func aliImageHandler(a *Adaptor, c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*types.NewAPIError, *dto.Usage) {
+func aliImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*types.NewAPIError, *dto.Usage) {
 	responseFormat := c.GetString("response_format")

 	var aliTaskResponse AliResponse
@@ -295,49 +282,66 @@ func aliImageHandler(a *Adaptor, c *gin.Context, resp *http.Response, info *rela
 		return types.NewError(errors.New(aliTaskResponse.Message), types.ErrorCodeBadResponse), nil
 	}

-	var (
-		aliResponse    *AliResponse
-		originRespBody []byte
-	)
-
-	if a.IsSyncImageModel {
-		aliResponse = &aliTaskResponse
-		originRespBody = responseBody
-	} else {
-		// 异步图片模型需要轮询任务结果
-		aliResponse, originRespBody, err = asyncTaskWait(c, info, aliTaskResponse.Output.TaskId)
-		if err != nil {
-			return types.NewError(err, types.ErrorCodeBadResponse), nil
-		}
-		if aliResponse.Output.TaskStatus != "SUCCEEDED" {
-			return types.WithOpenAIError(types.OpenAIError{
-				Message: aliResponse.Output.Message,
-				Type:    "ali_error",
-				Param:   "",
-				Code:    aliResponse.Output.Code,
-			}, resp.StatusCode), nil
-		}
+	aliResponse, originRespBody, err := asyncTaskWait(c, info, aliTaskResponse.Output.TaskId)
+	if err != nil {
+		return types.NewError(err, types.ErrorCodeBadResponse), nil
 	}

-	//logger.LogDebug(c, "ali_async_task_result: "+string(originRespBody))
-	if a.IsSyncImageModel {
-		logger.LogDebug(c, "ali_sync_image_result: "+string(originRespBody))
-	} else {
-		logger.LogDebug(c, "ali_async_image_result: "+string(originRespBody))
+	if aliResponse.Output.TaskStatus != "SUCCEEDED" {
+		return types.WithOpenAIError(types.OpenAIError{
+			Message: aliResponse.Output.Message,
+			Type:    "ali_error",
+			Param:   "",
+			Code:    aliResponse.Output.Code,
+		}, resp.StatusCode), nil
 	}

-	imageResponses := responseAli2OpenAIImage(c, aliResponse, originRespBody, info, responseFormat)
-	// 可能生成多张图片，修正计费数量n
-	if aliResponse.Usage.ImageCount != 0 {
-		info.PriceData.AddOtherRatio("n", float64(aliResponse.Usage.ImageCount))
-	} else if len(imageResponses.Data) != 0 {
-		info.PriceData.AddOtherRatio("n", float64(len(imageResponses.Data)))
-	}
-	jsonResponse, err := common.Marshal(imageResponses)
+	fullTextResponse := responseAli2OpenAIImage(c, aliResponse, originRespBody, info, responseFormat)
+	jsonResponse, err := common.Marshal(fullTextResponse)
+	if err != nil {
+		return types.NewError(err, types.ErrorCodeBadResponseBody), nil
+	}
+	service.IOCopyBytesGracefully(c, resp, jsonResponse)
+	return nil, &dto.Usage{}
+}
+
+func aliImageEditHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*types.NewAPIError, *dto.Usage) {
+	var aliResponse AliResponse
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError), nil
+	}
+
+	service.CloseResponseBodyGracefully(resp)
+	err = common.Unmarshal(responseBody, &aliResponse)
+	if err != nil {
+		return types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError), nil
+	}
+
+	if aliResponse.Message != "" {
+		logger.LogError(c, "ali_task_failed: "+aliResponse.Message)
+		return types.NewError(errors.New(aliResponse.Message), types.ErrorCodeBadResponse), nil
+	}
+	var fullTextResponse dto.ImageResponse
+	if len(aliResponse.Output.Choices) > 0 {
+		fullTextResponse = dto.ImageResponse{
+			Created: info.StartTime.Unix(),
+			Data: []dto.ImageData{
+				{
+					Url:     aliResponse.Output.Choices[0]["message"].(map[string]any)["content"].([]any)[0].(map[string]any)["image"].(string),
+					B64Json: "",
+				},
+			},
+		}
+	}
+
+	var mapResponse map[string]any
+	_ = common.Unmarshal(responseBody, &mapResponse)
+	fullTextResponse.Extra = mapResponse
+	jsonResponse, err := common.Marshal(fullTextResponse)
 	if err != nil {
 		return types.NewError(err, types.ErrorCodeBadResponseBody), nil
 	}
 	service.IOCopyBytesGracefully(c, resp, jsonResponse)
-
 	return nil, &dto.Usage{}
 }
--- a/relay/channel/ali/image_wan.go
+++ b/relay/channel/ali/image_wan.go
@@ -26,22 +26,14 @@ func oaiFormEdit2WanxImageEdit(c *gin.Context, info *relaycommon.RelayInfo, requ
 	if wanInput.Images, err = getImageBase64sFromForm(c, "image"); err != nil {
 		return nil, fmt.Errorf("get image base64s from form failed: %w", err)
 	}
-	//wanParams := WanImageParameters{
-	//	N: int(request.N),
-	//}
-	imageRequest.Input = wanInput
-	imageRequest.Parameters = AliImageParameters{
+	wanParams := WanImageParameters{
 		N: int(request.N),
 	}
-	info.PriceData.AddOtherRatio("n", float64(imageRequest.Parameters.N))
-
+	imageRequest.Input = wanInput
+	imageRequest.Parameters = wanParams
 	return &imageRequest, nil
 }

-func isOldWanModel(modelName string) bool {
-	return strings.Contains(modelName, "wan") && !strings.Contains(modelName, "wan2.6")
-}
-
 func isWanModel(modelName string) bool {
 	return strings.Contains(modelName, "wan")
 }
--- a/relay/channel/aws/constants.go
+++ b/relay/channel/aws/constants.go
@@ -18,7 +18,6 @@ var awsModelIDMap = map[string]string{
 	"claude-opus-4-1-20250805":   "anthropic.claude-opus-4-1-20250805-v1:0",
 	"claude-sonnet-4-5-20250929": "anthropic.claude-sonnet-4-5-20250929-v1:0",
 	"claude-haiku-4-5-20251001":  "anthropic.claude-haiku-4-5-20251001-v1:0",
-	"claude-opus-4-5-20251101":   "anthropic.claude-opus-4-5-20251101-v1:0",
 	// Nova models
 	"nova-micro-v1:0":   "amazon.nova-micro-v1:0",
 	"nova-lite-v1:0":    "amazon.nova-lite-v1:0",
@@ -77,11 +76,6 @@ var awsModelCanCrossRegionMap = map[string]map[string]bool{
 		"ap": true,
 		"eu": true,
 	},
-	"anthropic.claude-opus-4-5-20251101-v1:0": {
-		"us": true,
-		"ap": true,
-		"eu": true,
-	},
 	"anthropic.claude-haiku-4-5-20251001-v1:0": {
 		"us": true,
 		"ap": true,
--- a/relay/channel/aws/relay-aws.go
+++ b/relay/channel/aws/relay-aws.go
@@ -1,13 +1,11 @@
 package aws

 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"strings"
-	"time"

 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/dto"
@@ -20,7 +18,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"

-	"github.com/QuantumNous/new-api/setting/model_setting"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"
@@ -28,24 +25,6 @@ import (
 	"github.com/aws/smithy-go/auth/bearer"
 )

-// getAwsErrorStatusCode extracts HTTP status code from AWS SDK error
-func getAwsErrorStatusCode(err error) int {
-	// Check for HTTP response error which contains status code
-	var httpErr interface{ HTTPStatusCode() int }
-	if errors.As(err, &httpErr) {
-		return httpErr.HTTPStatusCode()
-	}
-	// Default to 500 if we can't determine the status code
-	return http.StatusInternalServerError
-}
-
-func newAwsInvokeContext() (context.Context, context.CancelFunc) {
-	if common.RelayTimeout <= 0 {
-		return context.Background(), func() {}
-	}
-	return context.WithTimeout(context.Background(), time.Duration(common.RelayTimeout)*time.Second)
-}
-
 func newAwsClient(c *gin.Context, info *relaycommon.RelayInfo) (*bedrockruntime.Client, error) {
 	var (
 		httpClient *http.Client
@@ -126,7 +105,6 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
 			return nil, types.NewError(errors.Wrap(err, "marshal nova request"), types.ErrorCodeBadResponseBody)
 		}
 		awsReq.Body = reqBody
-		a.AwsReq = awsReq
 		return nil, nil
 	} else {
 		awsClaudeReq, err := formatRequest(requestBody, requestHeader)
@@ -140,7 +118,7 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
 				Accept:      aws.String("application/json"),
 				ContentType: aws.String("application/json"),
 			}
-			awsReq.Body, err = buildAwsRequestBody(c, info, awsClaudeReq)
+			awsReq.Body, err = common.Marshal(awsClaudeReq)
 			if err != nil {
 				return nil, types.NewError(errors.Wrap(err, "marshal aws request fail"), types.ErrorCodeBadRequestBody)
 			}
@@ -152,7 +130,7 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
 				Accept:      aws.String("application/json"),
 				ContentType: aws.String("application/json"),
 			}
-			awsReq.Body, err = buildAwsRequestBody(c, info, awsClaudeReq)
+			awsReq.Body, err = common.Marshal(awsClaudeReq)
 			if err != nil {
 				return nil, types.NewError(errors.Wrap(err, "marshal aws request fail"), types.ErrorCodeBadRequestBody)
 			}
@@ -162,24 +140,6 @@ func doAwsClientRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor,
 	}
 }

-// buildAwsRequestBody prepares the payload for AWS requests, applying passthrough rules when enabled.
-func buildAwsRequestBody(c *gin.Context, info *relaycommon.RelayInfo, awsClaudeReq any) ([]byte, error) {
-	if model_setting.GetGlobalSettings().PassThroughRequestEnabled || info.ChannelSetting.PassThroughBodyEnabled {
-		body, err := common.GetRequestBody(c)
-		if err != nil {
-			return nil, errors.Wrap(err, "get request body for pass-through fail")
-		}
-		var data map[string]interface{}
-		if err := common.Unmarshal(body, &data); err != nil {
-			return nil, errors.Wrap(err, "pass-through unmarshal request body fail")
-		}
-		delete(data, "model")
-		delete(data, "stream")
-		return common.Marshal(data)
-	}
-	return common.Marshal(awsClaudeReq)
-}
-
 func getAwsRegionPrefix(awsRegionId string) string {
 	parts := strings.Split(awsRegionId, "-")
 	regionPrefix := ""
@@ -211,13 +171,9 @@ func getAwsModelID(requestModel string) string {

 func awsHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {

-	ctx, cancel := newAwsInvokeContext()
-	defer cancel()
-
-	awsResp, err := a.AwsClient.InvokeModel(ctx, a.AwsReq.(*bedrockruntime.InvokeModelInput))
+	awsResp, err := a.AwsClient.InvokeModel(c.Request.Context(), a.AwsReq.(*bedrockruntime.InvokeModelInput))
 	if err != nil {
-		statusCode := getAwsErrorStatusCode(err)
-		return types.NewOpenAIError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeAwsInvokeError, statusCode), nil
+		return types.NewOpenAIError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeAwsInvokeError, http.StatusInternalServerError), nil
 	}

 	claudeInfo := &claude.ClaudeResponseInfo{
@@ -241,13 +197,9 @@ func awsHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types
 }

 func awsStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {
-	ctx, cancel := newAwsInvokeContext()
-	defer cancel()
-
-	awsResp, err := a.AwsClient.InvokeModelWithResponseStream(ctx, a.AwsReq.(*bedrockruntime.InvokeModelWithResponseStreamInput))
+	awsResp, err := a.AwsClient.InvokeModelWithResponseStream(c.Request.Context(), a.AwsReq.(*bedrockruntime.InvokeModelWithResponseStreamInput))
 	if err != nil {
-		statusCode := getAwsErrorStatusCode(err)
-		return types.NewOpenAIError(errors.Wrap(err, "InvokeModelWithResponseStream"), types.ErrorCodeAwsInvokeError, statusCode), nil
+		return types.NewOpenAIError(errors.Wrap(err, "InvokeModelWithResponseStream"), types.ErrorCodeAwsInvokeError, http.StatusInternalServerError), nil
 	}
 	stream := awsResp.GetStream()
 	defer stream.Close()
@@ -284,13 +236,9 @@ func awsStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (
 // Nova模型处理函数
 func handleNovaRequest(c *gin.Context, info *relaycommon.RelayInfo, a *Adaptor) (*types.NewAPIError, *dto.Usage) {

-	ctx, cancel := newAwsInvokeContext()
-	defer cancel()
-
-	awsResp, err := a.AwsClient.InvokeModel(ctx, a.AwsReq.(*bedrockruntime.InvokeModelInput))
+	awsResp, err := a.AwsClient.InvokeModel(c.Request.Context(), a.AwsReq.(*bedrockruntime.InvokeModelInput))
 	if err != nil {
-		statusCode := getAwsErrorStatusCode(err)
-		return types.NewOpenAIError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeAwsInvokeError, statusCode), nil
+		return types.NewError(errors.Wrap(err, "InvokeModel"), types.ErrorCodeChannelAwsClientError), nil
 	}

 	// 解析Nova响应
--- a/relay/channel/baidu/relay-baidu.go
+++ b/relay/channel/baidu/relay-baidu.go
@@ -150,7 +150,7 @@ func baiduHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respon
 		return types.NewError(err, types.ErrorCodeBadResponseBody), nil
 	}
 	if baiduResponse.ErrorMsg != "" {
-		return types.NewError(fmt.Errorf("%s", baiduResponse.ErrorMsg), types.ErrorCodeBadResponseBody), nil
+		return types.NewError(fmt.Errorf(baiduResponse.ErrorMsg), types.ErrorCodeBadResponseBody), nil
 	}
 	fullTextResponse := responseBaidu2OpenAI(&baiduResponse)
 	jsonResponse, err := json.Marshal(fullTextResponse)
@@ -175,7 +175,7 @@ func baiduEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *ht
 		return types.NewError(err, types.ErrorCodeBadResponseBody), nil
 	}
 	if baiduResponse.ErrorMsg != "" {
-		return types.NewError(fmt.Errorf("%s", baiduResponse.ErrorMsg), types.ErrorCodeBadResponseBody), nil
+		return types.NewError(fmt.Errorf(baiduResponse.ErrorMsg), types.ErrorCodeBadResponseBody), nil
 	}
 	fullTextResponse := embeddingResponseBaidu2OpenAI(&baiduResponse)
 	jsonResponse, err := json.Marshal(fullTextResponse)
--- a/relay/channel/claude/constants.go
+++ b/relay/channel/claude/constants.go
@@ -9,7 +9,6 @@ var ModelList = []string{
 	"claude-3-opus-20240229",
 	"claude-3-haiku-20240307",
 	"claude-3-5-haiku-20241022",
-	"claude-haiku-4-5-20251001",
 	"claude-3-5-sonnet-20240620",
 	"claude-3-5-sonnet-20241022",
 	"claude-3-7-sonnet-20250219",
@@ -22,8 +21,6 @@ var ModelList = []string{
 	"claude-opus-4-1-20250805-thinking",
 	"claude-sonnet-4-5-20250929",
 	"claude-sonnet-4-5-20250929-thinking",
-	"claude-opus-4-5-20251101",
-	"claude-opus-4-5-20251101-thinking",
 }

 var ChannelName = "claude"
--- a/relay/channel/claude/relay-claude.go
+++ b/relay/channel/claude/relay-claude.go
@@ -483,11 +483,9 @@ func StreamResponseClaude2OpenAI(reqMode int, claudeResponse *dto.ClaudeResponse
 				}
 			}
 		} else if claudeResponse.Type == "message_delta" {
-			if claudeResponse.Delta != nil && claudeResponse.Delta.StopReason != nil {
-				finishReason := stopReasonClaude2OpenAI(*claudeResponse.Delta.StopReason)
-				if finishReason != "null" {
-					choice.FinishReason = &finishReason
-				}
+			finishReason := stopReasonClaude2OpenAI(*claudeResponse.Delta.StopReason)
+			if finishReason != "null" {
+				choice.FinishReason = &finishReason
 			}
 			//claudeUsage = &claudeResponse.Usage
 		} else if claudeResponse.Type == "message_stop" {
@@ -675,7 +673,7 @@ func HandleStreamResponseData(c *gin.Context, info *relaycommon.RelayInfo, claud
 func HandleStreamFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, claudeInfo *ClaudeResponseInfo, requestMode int) {

 	if requestMode == RequestModeCompletion {
-		claudeInfo.Usage = service.ResponseText2Usage(c, claudeInfo.ResponseText.String(), info.UpstreamModelName, info.GetEstimatePromptTokens())
+		claudeInfo.Usage = service.ResponseText2Usage(c, claudeInfo.ResponseText.String(), info.UpstreamModelName, info.PromptTokens)
 	} else {
 		if claudeInfo.Usage.PromptTokens == 0 {
 			//上游出错
@@ -736,7 +734,10 @@ func HandleClaudeResponseData(c *gin.Context, info *relaycommon.RelayInfo, claud
 		return types.WithClaudeError(*claudeError, http.StatusInternalServerError)
 	}
 	if requestMode == RequestModeCompletion {
-		claudeInfo.Usage = service.ResponseText2Usage(c, claudeResponse.Completion, info.UpstreamModelName, info.GetEstimatePromptTokens())
+		completionTokens := service.CountTextToken(claudeResponse.Completion, info.OriginModelName)
+		claudeInfo.Usage.PromptTokens = info.PromptTokens
+		claudeInfo.Usage.CompletionTokens = completionTokens
+		claudeInfo.Usage.TotalTokens = info.PromptTokens + completionTokens
 	} else {
 		claudeInfo.Usage.PromptTokens = claudeResponse.Usage.InputTokens
 		claudeInfo.Usage.CompletionTokens = claudeResponse.Usage.OutputTokens
--- a/relay/channel/cloudflare/relay_cloudflare.go
+++ b/relay/channel/cloudflare/relay_cloudflare.go
@@ -74,7 +74,7 @@ func cfStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Res
 	if err := scanner.Err(); err != nil {
 		logger.LogError(c, "error_scanning_stream_response: "+err.Error())
 	}
-	usage := service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.GetEstimatePromptTokens())
+	usage := service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.PromptTokens)
 	if info.ShouldIncludeUsage {
 		response := helper.GenerateFinalUsageResponse(id, info.StartTime.Unix(), info.UpstreamModelName, *usage)
 		err := helper.ObjectData(c, response)
@@ -105,7 +105,7 @@ func cfHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response)
 	for _, choice := range response.Choices {
 		responseText += choice.Message.StringContent()
 	}
-	usage := service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.GetEstimatePromptTokens())
+	usage := service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.PromptTokens)
 	response.Usage = *usage
 	response.Id = helper.GetResponseID(c)
 	jsonResponse, err := json.Marshal(response)
@@ -142,6 +142,10 @@ func cfSTTHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respon
 	c.Writer.WriteHeader(resp.StatusCode)
 	_, _ = c.Writer.Write(jsonResponse)

-	usage := service.ResponseText2Usage(c, cfResp.Result.Text, info.UpstreamModelName, info.GetEstimatePromptTokens())
+	usage := &dto.Usage{}
+	usage.PromptTokens = info.PromptTokens
+	usage.CompletionTokens = service.CountTextToken(cfResp.Result.Text, info.UpstreamModelName)
+	usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
+
 	return nil, usage
 }
--- a/relay/channel/cohere/relay-cohere.go
+++ b/relay/channel/cohere/relay-cohere.go
@@ -165,7 +165,7 @@ func cohereStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
 		}
 	})
 	if usage.PromptTokens == 0 {
-		usage = service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.GetEstimatePromptTokens())
+		usage = service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.PromptTokens)
 	}
 	return usage, nil
 }
@@ -225,9 +225,9 @@ func cohereRerankHandler(c *gin.Context, resp *http.Response, info *relaycommon.
 	}
 	usage := dto.Usage{}
 	if cohereResp.Meta.BilledUnits.InputTokens == 0 {
-		usage.PromptTokens = info.GetEstimatePromptTokens()
+		usage.PromptTokens = info.PromptTokens
 		usage.CompletionTokens = 0
-		usage.TotalTokens = info.GetEstimatePromptTokens()
+		usage.TotalTokens = info.PromptTokens
 	} else {
 		usage.PromptTokens = cohereResp.Meta.BilledUnits.InputTokens
 		usage.CompletionTokens = cohereResp.Meta.BilledUnits.OutputTokens
--- a/relay/channel/coze/relay-coze.go
+++ b/relay/channel/coze/relay-coze.go
@@ -208,7 +208,7 @@ func handleCozeEvent(c *gin.Context, event string, data string, responseText *st
 			return
 		}

-		common.SysLog(fmt.Sprintf("stream event error: %v %v", errorData.Code, errorData.Message))
+		common.SysLog(fmt.Sprintf("stream event error: ", errorData.Code, errorData.Message))
 	}
 }

--- a/relay/channel/dify/relay-dify.go
+++ b/relay/channel/dify/relay-dify.go
@@ -246,7 +246,7 @@ func difyStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.R
 	})
 	helper.Done(c)
 	if usage.TotalTokens == 0 {
-		usage = service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.GetEstimatePromptTokens())
+		usage = service.ResponseText2Usage(c, responseText, info.UpstreamModelName, info.PromptTokens)
 	}
 	usage.CompletionTokens += nodeToken
 	return usage, nil
--- a/relay/channel/gemini/adaptor.go
+++ b/relay/channel/gemini/adaptor.go
@@ -13,7 +13,6 @@ import (
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	"github.com/QuantumNous/new-api/relay/constant"
 	"github.com/QuantumNous/new-api/setting/model_setting"
-	"github.com/QuantumNous/new-api/setting/reasoning"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-gonic/gin"
@@ -138,8 +137,6 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 			info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-thinking")
 		} else if strings.HasSuffix(info.UpstreamModelName, "-nothinking") {
 			info.UpstreamModelName = strings.TrimSuffix(info.UpstreamModelName, "-nothinking")
-		} else if baseModel, level, ok := reasoning.TrimEffortSuffix(info.UpstreamModelName); ok && level != "" {
-			info.UpstreamModelName = baseModel
 		}
 	}

--- a/relay/channel/gemini/relay-gemini-native.go
+++ b/relay/channel/gemini/relay-gemini-native.go
@@ -5,6 +5,7 @@ import (
 	"net/http"

 	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/logger"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
@@ -69,7 +70,12 @@ func NativeGeminiEmbeddingHandler(c *gin.Context, resp *http.Response, info *rel
 		println(string(responseBody))
 	}

-	usage := service.ResponseText2Usage(c, "", info.UpstreamModelName, info.GetEstimatePromptTokens())
+	usage := &dto.Usage{
+		PromptTokens: info.PromptTokens,
+		TotalTokens:  info.PromptTokens,
+	}
+
+	common.SetContextKey(c, constant.ContextKeyLocalCountTokens, true)

 	if info.IsGeminiBatchEmbedding {
 		var geminiResponse dto.GeminiBatchEmbeddingResponse
@@ -94,10 +100,10 @@ func GeminiTextGenerationStreamHandler(c *gin.Context, info *relaycommon.RelayIn
 	helper.SetEventStreamHeaders(c)

 	return geminiStreamHandler(c, info, resp, func(data string, geminiResponse *dto.GeminiChatResponse) bool {
+		// 直接发送 GeminiChatResponse 响应
 		err := helper.StringData(c, data)
 		if err != nil {
-			logger.LogError(c, "failed to write stream data: "+err.Error())
-			return false
+			logger.LogError(c, err.Error())
 		}
 		info.SendResponseCount++
 		return true
--- a/relay/channel/gemini/relay-gemini.go
+++ b/relay/channel/gemini/relay-gemini.go
@@ -19,8 +19,8 @@ import (
 	"github.com/QuantumNous/new-api/relay/helper"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/model_setting"
-	"github.com/QuantumNous/new-api/setting/reasoning"
 	"github.com/QuantumNous/new-api/types"
+
 	"github.com/gin-gonic/gin"
 )

@@ -32,7 +32,6 @@ var geminiSupportedMimeTypes = map[string]bool{
 	"audio/wav":       true,
 	"image/png":       true,
 	"image/jpeg":      true,
-	"image/jpg":       true, // support old image/jpeg
 	"image/webp":      true,
 	"text/plain":      true,
 	"video/mov":       true,
@@ -99,7 +98,6 @@ func clampThinkingBudget(modelName string, budget int) int {
 // "effort": "high" - Allocates a large portion of tokens for reasoning (approximately 80% of max_tokens)
 // "effort": "medium" - Allocates a moderate portion of tokens (approximately 50% of max_tokens)
 // "effort": "low" - Allocates a smaller portion of tokens (approximately 20% of max_tokens)
-// "effort": "minimal" - Allocates a minimal portion of tokens (approximately 5% of max_tokens)
 func clampThinkingBudgetByEffort(modelName string, effort string) int {
 	isNew25Pro := isNew25ProModel(modelName)
 	is25FlashLite := is25FlashLiteModel(modelName)
@@ -120,8 +118,6 @@ func clampThinkingBudgetByEffort(modelName string, effort string) int {
 		maxBudget = maxBudget * 50 / 100
 	case "low":
 		maxBudget = maxBudget * 20 / 100
-	case "minimal":
-		maxBudget = maxBudget * 5 / 100
 	}
 	return clampThinkingBudget(modelName, maxBudget)
 }
@@ -182,12 +178,6 @@ func ThinkingAdaptor(geminiRequest *dto.GeminiChatRequest, info *relaycommon.Rel
 					ThinkingBudget: common.GetPointer(0),
 				}
 			}
-		} else if _, level, ok := reasoning.TrimEffortSuffix(info.UpstreamModelName); ok && level != "" {
-			geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
-				IncludeThoughts: true,
-				ThinkingLevel:   level,
-			}
-			info.ReasoningEffort = level
 		}
 	}
 }
@@ -218,7 +208,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i

 	adaptorWithExtraBody := false

-	// patch extra_body
 	if len(textRequest.ExtraBody) > 0 {
 		if !strings.HasSuffix(info.UpstreamModelName, "-nothinking") {
 			var extraBody map[string]interface{}
@@ -250,39 +239,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 						}
 					}
 				}
-
-				// check error param name like imageConfig, should be image_config
-				if _, hasErrorParam := googleBody["imageConfig"]; hasErrorParam {
-					return nil, errors.New("extra_body.google.imageConfig is not supported, use extra_body.google.image_config instead")
-				}
-
-				if imageConfig, ok := googleBody["image_config"].(map[string]interface{}); ok {
-					// check error param name like aspectRatio, should be aspect_ratio
-					if _, hasErrorParam := imageConfig["aspectRatio"]; hasErrorParam {
-						return nil, errors.New("extra_body.google.image_config.aspectRatio is not supported, use extra_body.google.image_config.aspect_ratio instead")
-					}
-					// check error param name like imageSize, should be image_size
-					if _, hasErrorParam := imageConfig["imageSize"]; hasErrorParam {
-						return nil, errors.New("extra_body.google.image_config.imageSize is not supported, use extra_body.google.image_config.image_size instead")
-					}
-
-					// convert snake_case to camelCase for Gemini API
-					geminiImageConfig := make(map[string]interface{})
-					if aspectRatio, ok := imageConfig["aspect_ratio"]; ok {
-						geminiImageConfig["aspectRatio"] = aspectRatio
-					}
-					if imageSize, ok := imageConfig["image_size"]; ok {
-						geminiImageConfig["imageSize"] = imageSize
-					}
-
-					if len(geminiImageConfig) > 0 {
-						imageConfigBytes, err := common.Marshal(geminiImageConfig)
-						if err != nil {
-							return nil, fmt.Errorf("failed to marshal image_config: %w", err)
-						}
-						geminiRequest.GenerationConfig.ImageConfig = imageConfigBytes
-					}
-				}
 			}
 		}
 	}
@@ -375,7 +331,7 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 	var system_content []string
 	//shouldAddDummyModelMessage := false
 	for _, message := range textRequest.Messages {
-		if message.Role == "system" || message.Role == "developer" {
+		if message.Role == "system" {
 			system_content = append(system_content, message.StringContent())
 			continue
 		} else if message.Role == "tool" || message.Role == "function" {
@@ -456,68 +412,9 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 				if part.Text == "" {
 					continue
 				}
-				// check markdown image ![image](data:image/jpeg;base64,xxxxxxxxxxxx)
-				// 使用字符串查找而非正则，避免大文本性能问题
-				text := part.Text
-				hasMarkdownImage := false
-				for {
-					// 快速检查是否包含 markdown 图片标记
-					startIdx := strings.Index(text, "![")
-					if startIdx == -1 {
-						break
-					}
-					// 找到 ](
-					bracketIdx := strings.Index(text[startIdx:], "](data:")
-					if bracketIdx == -1 {
-						break
-					}
-					bracketIdx += startIdx
-					// 找到闭合的 )
-					closeIdx := strings.Index(text[bracketIdx+2:], ")")
-					if closeIdx == -1 {
-						break
-					}
-					closeIdx += bracketIdx + 2
-
-					hasMarkdownImage = true
-					// 添加图片前的文本
-					if startIdx > 0 {
-						textBefore := text[:startIdx]
-						if textBefore != "" {
-							parts = append(parts, dto.GeminiPart{
-								Text: textBefore,
-							})
-						}
-					}
-					// 提取 data URL (从 "](" 后面开始，到 ")" 之前)
-					dataUrl := text[bracketIdx+2 : closeIdx]
-					imageNum += 1
-					if constant.GeminiVisionMaxImageNum != -1 && imageNum > constant.GeminiVisionMaxImageNum {
-						return nil, fmt.Errorf("too many images in the message, max allowed is %d", constant.GeminiVisionMaxImageNum)
-					}
-					format, base64String, err := service.DecodeBase64FileData(dataUrl)
-					if err != nil {
-						return nil, fmt.Errorf("decode markdown base64 image data failed: %s", err.Error())
-					}
-					imgPart := dto.GeminiPart{
-						InlineData: &dto.GeminiInlineData{
-							MimeType: format,
-							Data:     base64String,
-						},
-					}
-					if shouldAttachThoughtSignature {
-						imgPart.ThoughtSignature = json.RawMessage(strconv.Quote(thoughtSignatureBypassValue))
-					}
-					parts = append(parts, imgPart)
-					// 继续处理剩余文本
-					text = text[closeIdx+1:]
-				}
-				// 添加剩余文本或原始文本（如果没有找到 markdown 图片）
-				if !hasMarkdownImage {
-					parts = append(parts, dto.GeminiPart{
-						Text: part.Text,
-					})
-				}
+				parts = append(parts, dto.GeminiPart{
+					Text: part.Text,
+				})
 			} else if part.Type == dto.ContentTypeImageURL {
 				imageNum += 1

@@ -587,17 +484,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 			}
 		}

-		// 如果需要附加签名但还没有附加（没有 tool_calls 或 tool_calls 为空），
-		// 则在第一个文本 part 上附加 thoughtSignature
-		if shouldAttachThoughtSignature && !signatureAttached && len(parts) > 0 {
-			for i := range parts {
-				if parts[i].Text != "" {
-					parts[i].ThoughtSignature = json.RawMessage(strconv.Quote(thoughtSignatureBypassValue))
-					break
-				}
-			}
-		}
-
 		content.Parts = parts

 		// there's no assistant role in gemini and API shall vomit if Role is not user or model
@@ -1125,7 +1011,7 @@ func geminiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
 	if usage.CompletionTokens <= 0 {
 		str := responseText.String()
 		if len(str) > 0 {
-			usage = service.ResponseText2Usage(c, responseText.String(), info.UpstreamModelName, info.GetEstimatePromptTokens())
+			usage = service.ResponseText2Usage(c, responseText.String(), info.UpstreamModelName, info.PromptTokens)
 		} else {
 			usage = &dto.Usage{}
 		}
@@ -1298,7 +1184,11 @@ func GeminiEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *h
 	// Google has not yet clarified how embedding models will be billed
 	// refer to openai billing method to use input tokens billing
 	// https://platform.openai.com/docs/guides/embeddings#what-are-embeddings
-	usage := service.ResponseText2Usage(c, "", info.UpstreamModelName, info.GetEstimatePromptTokens())
+	usage := &dto.Usage{
+		PromptTokens:     info.PromptTokens,
+		CompletionTokens: 0,
+		TotalTokens:      info.PromptTokens,
+	}
 	openAIResponse.Usage = *usage

 	jsonResponse, jsonErr := common.Marshal(openAIResponse)
--- a/relay/channel/minimax/tts.go
+++ b/relay/channel/minimax/tts.go
@@ -163,7 +163,7 @@ func handleTTSResponse(c *gin.Context, resp *http.Response, info *relaycommon.Re
 	}

 	usage = &dto.Usage{
-		PromptTokens:     info.GetEstimatePromptTokens(),
+		PromptTokens:     info.PromptTokens,
 		CompletionTokens: 0,
 		TotalTokens:      int(minimaxResp.ExtraInfo.UsageCharacters),
 	}
--- a/relay/channel/moonshot/adaptor.go
+++ b/relay/channel/moonshot/adaptor.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"

-	channelconstant "github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/relay/channel"
 	"github.com/QuantumNous/new-api/relay/channel/claude"
@@ -45,16 +44,6 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
 }

 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
-	baseURL := info.ChannelBaseUrl
-	if specialPlan, ok := channelconstant.ChannelSpecialBases[baseURL]; ok {
-		if info.RelayFormat == types.RelayFormatClaude {
-			return fmt.Sprintf("%s/v1/messages", specialPlan.ClaudeBaseURL), nil
-		}
-		if info.RelayFormat == types.RelayFormatOpenAI {
-			return fmt.Sprintf("%s/chat/completions", specialPlan.OpenAIBaseURL), nil
-		}
-	}
-
 	switch info.RelayFormat {
 	case types.RelayFormatClaude:
 		return fmt.Sprintf("%s/anthropic/v1/messages", info.ChannelBaseUrl), nil
--- a/relay/channel/ollama/dto.go
+++ b/relay/channel/ollama/dto.go
@@ -67,40 +67,3 @@ type OllamaEmbeddingResponse struct {
 	Embeddings      [][]float64 `json:"embeddings"`
 	PromptEvalCount int         `json:"prompt_eval_count,omitempty"`
 }
-
-type OllamaTagsResponse struct {
-	Models []OllamaModel `json:"models"`
-}
-
-type OllamaModel struct {
-	Name       string            `json:"name"`
-	Size       int64             `json:"size"`
-	Digest     string            `json:"digest,omitempty"`
-	ModifiedAt string            `json:"modified_at"`
-	Details    OllamaModelDetail `json:"details,omitempty"`
-}
-
-type OllamaModelDetail struct {
-	ParentModel       string   `json:"parent_model,omitempty"`
-	Format            string   `json:"format,omitempty"`
-	Family            string   `json:"family,omitempty"`
-	Families          []string `json:"families,omitempty"`
-	ParameterSize     string   `json:"parameter_size,omitempty"`
-	QuantizationLevel string   `json:"quantization_level,omitempty"`
-}
-
-type OllamaPullRequest struct {
-	Name   string `json:"name"`
-	Stream bool   `json:"stream,omitempty"`
-}
-
-type OllamaPullResponse struct {
-	Status    string `json:"status"`
-	Digest    string `json:"digest,omitempty"`
-	Total     int64  `json:"total,omitempty"`
-	Completed int64  `json:"completed,omitempty"`
-}
-
-type OllamaDeleteRequest struct {
-	Name string `json:"name"`
-}
--- a/relay/channel/ollama/relay-ollama.go
+++ b/relay/channel/ollama/relay-ollama.go
@@ -1,13 +1,11 @@
 package ollama

 import (
-	"bufio"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"strings"
-	"time"

 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/dto"
@@ -285,246 +283,3 @@ func ollamaEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *h
 	service.IOCopyBytesGracefully(c, resp, out)
 	return usage, nil
 }
-
-func FetchOllamaModels(baseURL, apiKey string) ([]OllamaModel, error) {
-	url := fmt.Sprintf("%s/api/tags", baseURL)
-
-	client := &http.Client{}
-	request, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, fmt.Errorf("创建请求失败: %v", err)
-	}
-
-	// Ollama 通常不需要 Bearer token，但为了兼容性保留
-	if apiKey != "" {
-		request.Header.Set("Authorization", "Bearer "+apiKey)
-	}
-
-	response, err := client.Do(request)
-	if err != nil {
-		return nil, fmt.Errorf("请求失败: %v", err)
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(response.Body)
-		return nil, fmt.Errorf("服务器返回错误 %d: %s", response.StatusCode, string(body))
-	}
-
-	var tagsResponse OllamaTagsResponse
-	body, err := io.ReadAll(response.Body)
-	if err != nil {
-		return nil, fmt.Errorf("读取响应失败: %v", err)
-	}
-
-	err = common.Unmarshal(body, &tagsResponse)
-	if err != nil {
-		return nil, fmt.Errorf("解析响应失败: %v", err)
-	}
-
-	return tagsResponse.Models, nil
-}
-
-// 拉取 Ollama 模型 (非流式)
-func PullOllamaModel(baseURL, apiKey, modelName string) error {
-	url := fmt.Sprintf("%s/api/pull", baseURL)
-
-	pullRequest := OllamaPullRequest{
-		Name:   modelName,
-		Stream: false, // 非流式，简化处理
-	}
-
-	requestBody, err := common.Marshal(pullRequest)
-	if err != nil {
-		return fmt.Errorf("序列化请求失败: %v", err)
-	}
-
-	client := &http.Client{
-		Timeout: 30 * 60 * 1000 * time.Millisecond, // 30分钟超时，支持大模型
-	}
-	request, err := http.NewRequest("POST", url, strings.NewReader(string(requestBody)))
-	if err != nil {
-		return fmt.Errorf("创建请求失败: %v", err)
-	}
-
-	request.Header.Set("Content-Type", "application/json")
-	if apiKey != "" {
-		request.Header.Set("Authorization", "Bearer "+apiKey)
-	}
-
-	response, err := client.Do(request)
-	if err != nil {
-		return fmt.Errorf("请求失败: %v", err)
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(response.Body)
-		return fmt.Errorf("拉取模型失败 %d: %s", response.StatusCode, string(body))
-	}
-
-	return nil
-}
-
-// 流式拉取 Ollama 模型 (支持进度回调)
-func PullOllamaModelStream(baseURL, apiKey, modelName string, progressCallback func(OllamaPullResponse)) error {
-	url := fmt.Sprintf("%s/api/pull", baseURL)
-
-	pullRequest := OllamaPullRequest{
-		Name:   modelName,
-		Stream: true, // 启用流式
-	}
-
-	requestBody, err := common.Marshal(pullRequest)
-	if err != nil {
-		return fmt.Errorf("序列化请求失败: %v", err)
-	}
-
-	client := &http.Client{
-		Timeout: 60 * 60 * 1000 * time.Millisecond, // 1小时超时，支持超大模型
-	}
-	request, err := http.NewRequest("POST", url, strings.NewReader(string(requestBody)))
-	if err != nil {
-		return fmt.Errorf("创建请求失败: %v", err)
-	}
-
-	request.Header.Set("Content-Type", "application/json")
-	if apiKey != "" {
-		request.Header.Set("Authorization", "Bearer "+apiKey)
-	}
-
-	response, err := client.Do(request)
-	if err != nil {
-		return fmt.Errorf("请求失败: %v", err)
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(response.Body)
-		return fmt.Errorf("拉取模型失败 %d: %s", response.StatusCode, string(body))
-	}
-
-	// 读取流式响应
-	scanner := bufio.NewScanner(response.Body)
-	successful := false
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.TrimSpace(line) == "" {
-			continue
-		}
-
-		var pullResponse OllamaPullResponse
-		if err := common.Unmarshal([]byte(line), &pullResponse); err != nil {
-			continue // 忽略解析失败的行
-		}
-
-		if progressCallback != nil {
-			progressCallback(pullResponse)
-		}
-
-		// 检查是否出现错误或完成
-		if strings.EqualFold(pullResponse.Status, "error") {
-			return fmt.Errorf("拉取模型失败: %s", strings.TrimSpace(line))
-		}
-		if strings.EqualFold(pullResponse.Status, "success") {
-			successful = true
-			break
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return fmt.Errorf("读取流式响应失败: %v", err)
-	}
-
-	if !successful {
-		return fmt.Errorf("拉取模型未完成: 未收到成功状态")
-	}
-
-	return nil
-}
-
-// 删除 Ollama 模型
-func DeleteOllamaModel(baseURL, apiKey, modelName string) error {
-	url := fmt.Sprintf("%s/api/delete", baseURL)
-
-	deleteRequest := OllamaDeleteRequest{
-		Name: modelName,
-	}
-
-	requestBody, err := common.Marshal(deleteRequest)
-	if err != nil {
-		return fmt.Errorf("序列化请求失败: %v", err)
-	}
-
-	client := &http.Client{}
-	request, err := http.NewRequest("DELETE", url, strings.NewReader(string(requestBody)))
-	if err != nil {
-		return fmt.Errorf("创建请求失败: %v", err)
-	}
-
-	request.Header.Set("Content-Type", "application/json")
-	if apiKey != "" {
-		request.Header.Set("Authorization", "Bearer "+apiKey)
-	}
-
-	response, err := client.Do(request)
-	if err != nil {
-		return fmt.Errorf("请求失败: %v", err)
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(response.Body)
-		return fmt.Errorf("删除模型失败 %d: %s", response.StatusCode, string(body))
-	}
-
-	return nil
-}
-
-func FetchOllamaVersion(baseURL, apiKey string) (string, error) {
-	trimmedBase := strings.TrimRight(baseURL, "/")
-	if trimmedBase == "" {
-		return "", fmt.Errorf("baseURL 为空")
-	}
-
-	url := fmt.Sprintf("%s/api/version", trimmedBase)
-
-	client := &http.Client{Timeout: 10 * time.Second}
-	request, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return "", fmt.Errorf("创建请求失败: %v", err)
-	}
-
-	if apiKey != "" {
-		request.Header.Set("Authorization", "Bearer "+apiKey)
-	}
-
-	response, err := client.Do(request)
-	if err != nil {
-		return "", fmt.Errorf("请求失败: %v", err)
-	}
-	defer response.Body.Close()
-
-	body, err := io.ReadAll(response.Body)
-	if err != nil {
-		return "", fmt.Errorf("读取响应失败: %v", err)
-	}
-
-	if response.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("查询版本失败 %d: %s", response.StatusCode, string(body))
-	}
-
-	var versionResp struct {
-		Version string `json:"version"`
-	}
-
-	if err := json.Unmarshal(body, &versionResp); err != nil {
-		return "", fmt.Errorf("解析响应失败: %v", err)
-	}
-
-	if versionResp.Version == "" {
-		return "", fmt.Errorf("未返回版本信息")
-	}
-
-	return versionResp.Version, nil
-}
--- a/relay/channel/openai/adaptor.go
+++ b/relay/channel/openai/adaptor.go
@@ -42,7 +42,7 @@ type Adaptor struct {
 // support OAI models: o1-mini/o3-mini/o4-mini/o1/o3 etc...
 // minimal effort only available in gpt-5
 func parseReasoningEffortFromModelSuffix(model string) (string, string) {
-	effortSuffixes := []string{"-high", "-minimal", "-low", "-medium", "-none", "-xhigh"}
+	effortSuffixes := []string{"-high", "-minimal", "-low", "-medium", "-none"}
 	for _, suffix := range effortSuffixes {
 		if strings.HasSuffix(model, suffix) {
 			effort := strings.TrimPrefix(suffix, "-")
@@ -306,11 +306,10 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
 			request.Temperature = nil
 		}

-		// gpt-5系列模型适配 归零不再支持的参数
 		if strings.HasPrefix(info.UpstreamModelName, "gpt-5") {
-			request.Temperature = nil
-			request.TopP = 0 // oai 的 top_p 默认值是 1.0，但是为了 omitempty 属性直接不传，这里显式设置为 0
-			request.LogProbs = false
+			if info.UpstreamModelName != "gpt-5-chat-latest" {
+				request.Temperature = nil
+			}
 		}

 		// 转换模型推理力度后缀
--- a/relay/channel/openai/audio.go
+++ b/relay/channel/openai/audio.go
@@ -1,145 +0,0 @@
-package openai
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"math"
-	"net/http"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/constant"
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/logger"
-	relaycommon "github.com/QuantumNous/new-api/relay/common"
-	"github.com/QuantumNous/new-api/relay/helper"
-	"github.com/QuantumNous/new-api/service"
-	"github.com/QuantumNous/new-api/types"
-	"github.com/gin-gonic/gin"
-)
-
-func OpenaiTTSHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) *dto.Usage {
-	// the status code has been judged before, if there is a body reading failure,
-	// it should be regarded as a non-recoverable error, so it should not return err for external retry.
-	// Analogous to nginx's load balancing, it will only retry if it can't be requested or
-	// if the upstream returns a specific status code, once the upstream has already written the header,
-	// the subsequent failure of the response body should be regarded as a non-recoverable error,
-	// and can be terminated directly.
-	defer service.CloseResponseBodyGracefully(resp)
-	usage := &dto.Usage{}
-	usage.PromptTokens = info.GetEstimatePromptTokens()
-	usage.TotalTokens = info.GetEstimatePromptTokens()
-	for k, v := range resp.Header {
-		c.Writer.Header().Set(k, v[0])
-	}
-	c.Writer.WriteHeader(resp.StatusCode)
-
-	if info.IsStream {
-		helper.StreamScannerHandler(c, resp, info, func(data string) bool {
-			if service.SundaySearch(data, "usage") {
-				var simpleResponse dto.SimpleResponse
-				err := common.Unmarshal([]byte(data), &simpleResponse)
-				if err != nil {
-					logger.LogError(c, err.Error())
-				}
-				if simpleResponse.Usage.TotalTokens != 0 {
-					usage.PromptTokens = simpleResponse.Usage.InputTokens
-					usage.CompletionTokens = simpleResponse.OutputTokens
-					usage.TotalTokens = simpleResponse.TotalTokens
-				}
-			}
-			_ = helper.StringData(c, data)
-			return true
-		})
-	} else {
-		common.SetContextKey(c, constant.ContextKeyLocalCountTokens, true)
-		// 读取响应体到缓冲区
-		bodyBytes, err := io.ReadAll(resp.Body)
-		if err != nil {
-			logger.LogError(c, fmt.Sprintf("failed to read TTS response body: %v", err))
-			c.Writer.WriteHeaderNow()
-			return usage
-		}
-
-		// 写入响应到客户端
-		c.Writer.WriteHeaderNow()
-		_, err = c.Writer.Write(bodyBytes)
-		if err != nil {
-			logger.LogError(c, fmt.Sprintf("failed to write TTS response: %v", err))
-		}
-
-		// 计算音频时长并更新 usage
-		audioFormat := "mp3" // 默认格式
-		if audioReq, ok := info.Request.(*dto.AudioRequest); ok && audioReq.ResponseFormat != "" {
-			audioFormat = audioReq.ResponseFormat
-		}
-
-		var duration float64
-		var durationErr error
-
-		if audioFormat == "pcm" {
-			// PCM 格式没有文件头，根据 OpenAI TTS 的 PCM 参数计算时长
-			// 采样率: 24000 Hz, 位深度: 16-bit (2 bytes), 声道数: 1
-			const sampleRate = 24000
-			const bytesPerSample = 2
-			const channels = 1
-			duration = float64(len(bodyBytes)) / float64(sampleRate*bytesPerSample*channels)
-		} else {
-			ext := "." + audioFormat
-			reader := bytes.NewReader(bodyBytes)
-			duration, durationErr = common.GetAudioDuration(c.Request.Context(), reader, ext)
-		}
-
-		usage.PromptTokensDetails.TextTokens = usage.PromptTokens
-
-		if durationErr != nil {
-			logger.LogWarn(c, fmt.Sprintf("failed to get audio duration: %v", durationErr))
-			// 如果无法获取时长，则设置保底的 CompletionTokens，根据body大小计算
-			sizeInKB := float64(len(bodyBytes)) / 1000.0
-			estimatedTokens := int(math.Ceil(sizeInKB)) // 粗略估算每KB约等于1 token
-			usage.CompletionTokens = estimatedTokens
-			usage.CompletionTokenDetails.AudioTokens = estimatedTokens
-		} else if duration > 0 {
-			// 计算 token: ceil(duration) / 60.0 * 1000，即每分钟 1000 tokens
-			completionTokens := int(math.Round(math.Ceil(duration) / 60.0 * 1000))
-			usage.CompletionTokens = completionTokens
-			usage.CompletionTokenDetails.AudioTokens = completionTokens
-		}
-		usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
-	}
-
-	return usage
-}
-
-func OpenaiSTTHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo, responseFormat string) (*types.NewAPIError, *dto.Usage) {
-	defer service.CloseResponseBodyGracefully(resp)
-
-	responseBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError), nil
-	}
-	// 写入新的 response body
-	service.IOCopyBytesGracefully(c, resp, responseBody)
-
-	var responseData struct {
-		Usage *dto.Usage `json:"usage"`
-	}
-	if err := common.Unmarshal(responseBody, &responseData); err == nil && responseData.Usage != nil {
-		if responseData.Usage.TotalTokens > 0 {
-			usage := responseData.Usage
-			if usage.PromptTokens == 0 {
-				usage.PromptTokens = usage.InputTokens
-			}
-			if usage.CompletionTokens == 0 {
-				usage.CompletionTokens = usage.OutputTokens
-			}
-			return nil, usage
-		}
-	}
-
-	usage := &dto.Usage{}
-	usage.PromptTokens = info.GetEstimatePromptTokens()
-	usage.CompletionTokens = 0
-	usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
-	return nil, usage
-}
--- a/relay/channel/openai/helper.go
+++ b/relay/channel/openai/helper.go
@@ -5,6 +5,7 @@ import (
 	"strings"

 	"github.com/QuantumNous/new-api/common"
+	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
 	"github.com/QuantumNous/new-api/logger"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
@@ -18,10 +19,26 @@ import (
 	"github.com/gin-gonic/gin"
 )

-// 辅助函数
+// HandleStreamFormat processes a streaming response payload according to the provided RelayInfo and forwards it to the appropriate format-specific handler.
+//
+// It increments info.SendResponseCount, optionally converts OpenRouter "reasoning" fields to "reasoning_content" when the channel is OpenRouter and OpenRouterConvertToOpenAI is enabled, and then dispatches the (possibly modified) JSON string to the handler for the configured RelayFormat (OpenAI, Claude, or Gemini). It returns any error produced by the selected handler or nil if no handler is invoked.
 func HandleStreamFormat(c *gin.Context, info *relaycommon.RelayInfo, data string, forceFormat bool, thinkToContent bool) error {
 	info.SendResponseCount++

+	// OpenRouter reasoning 字段转换：reasoning -> reasoning_content
+	// 仅当启用转换为OpenAI兼容格式时执行
+	if info.ChannelType == constant.ChannelTypeOpenRouter && info.ChannelOtherSettings.OpenRouterConvertToOpenAI {
+		var streamResponse dto.ChatCompletionsStreamResponse
+		if err := common.Unmarshal(common.StringToByteSlice(data), &streamResponse); err == nil {
+			convertOpenRouterReasoningFieldsStream(&streamResponse)
+			// 重新序列化为JSON
+			newData, err := common.Marshal(streamResponse)
+			if err == nil {
+				data = string(newData)
+			}
+		}
+	}
+
 	switch info.RelayFormat {
 	case types.RelayFormatOpenAI:
 		return sendStreamData(c, info, data, forceFormat, thinkToContent)
@@ -172,7 +189,7 @@ func handleLastResponse(lastStreamData string, responseId *string, createAt *int
 	shouldSendLastResp *bool) error {

 	var lastStreamResponse dto.ChatCompletionsStreamResponse
-	if err := common.Unmarshal(common.StringToByteSlice(lastStreamData), &lastStreamResponse); err != nil {
+	if err := json.Unmarshal(common.StringToByteSlice(lastStreamData), &lastStreamResponse); err != nil {
 		return err
 	}

@@ -208,6 +225,7 @@ func HandleFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, lastStream
 		helper.Done(c)

 	case types.RelayFormatClaude:
+		info.ClaudeConvertInfo.Done = true
 		var streamResponse dto.ChatCompletionsStreamResponse
 		if err := common.Unmarshal(common.StringToByteSlice(lastStreamData), &streamResponse); err != nil {
 			common.SysLog("error unmarshalling stream response: " + err.Error())
@@ -220,7 +238,6 @@ func HandleFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, lastStream
 		for _, resp := range claudeResponses {
 			_ = helper.ClaudeData(c, *resp)
 		}
-		info.ClaudeConvertInfo.Done = true

 	case types.RelayFormatGemini:
 		var streamResponse dto.ChatCompletionsStreamResponse
@@ -253,9 +270,26 @@ func HandleFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, lastStream
 	}
 }

+// sendResponsesStreamData sends a non-empty data chunk for the given stream response to the client.
+// If data is empty, it returns without sending anything.
 func sendResponsesStreamData(c *gin.Context, streamResponse dto.ResponsesStreamResponse, data string) {
 	if data == "" {
 		return
 	}
 	helper.ResponseChunkData(c, streamResponse, data)
 }
+
+// convertOpenRouterReasoningFieldsStream converts each choice's `Delta` in a streaming ChatCompletions response
+// by normalizing any `reasoning` fields into `reasoning_content`.
+// It applies ConvertReasoningField to every choice's Delta and is a no-op if `response` is nil or has no choices.
+func convertOpenRouterReasoningFieldsStream(response *dto.ChatCompletionsStreamResponse) {
+	if response == nil || len(response.Choices) == 0 {
+		return
+	}
+
+	// 遍历所有choices，对每个Delta使用统一的泛型函数进行转换
+	for i := range response.Choices {
+		choice := &response.Choices[i]
+		ConvertReasoningField(&choice.Delta)
+	}
+}
--- a/relay/channel/openai/reasoning_converter.go
+++ b/relay/channel/openai/reasoning_converter.go
@@ -0,0 +1,35 @@
+package openai
+
+// ReasoningHolder 定义一个通用的接口，用于操作包含reasoning字段的结构体
+type ReasoningHolder interface {
+	// 获取reasoning字段的值
+	GetReasoning() string
+	// 设置reasoning字段的值
+	SetReasoning(reasoning string)
+	// 获取reasoning_content字段的值
+	GetReasoningContent() string
+	// 设置reasoning_content字段的值
+	SetReasoningContent(reasoningContent string)
+}
+
+// ConvertReasoningField 通用的reasoning字段转换函数
+// 将reasoning字段的内容移动到reasoning_content字段
+// ConvertReasoningField moves the holder's reasoning into its reasoning content and clears the original reasoning field.
+// If GetReasoning returns an empty string, the holder is unchanged. When clearing, types that implement SetReasoningToNil()
+// will have that method invoked; otherwise SetReasoning("") is used.
+func ConvertReasoningField[T ReasoningHolder](holder T) {
+	reasoning := holder.GetReasoning()
+	if reasoning != "" {
+		holder.SetReasoningContent(reasoning)
+	}
+	
+	// 使用类型断言来智能清理reasoning字段
+	switch h := any(holder).(type) {
+	case interface{ SetReasoningToNil() }:
+		// 流式响应：指针类型，设为nil
+		h.SetReasoningToNil()
+	default:
+		// 非流式响应：值类型，设为空字符串
+		holder.SetReasoning("")
+	}
+}
--- a/Show More
+++ b/Show More