🐛 fix: Gemini FunctionResponse parts inlineData parsing

Gemini native FunctionResponse may include media in functionResponse.parts. Previously, the Parts field was defined as json.RawMessage, preventing GeminiPart custom unmarshal logic from normalizing snake_case keys (inline_data/mime_type) to the camelCase format (inlineData/mimeType) required by Gemini REST. This change updates GeminiFunctionResponse.Parts to []GeminiPart so nested media parts are correctly parsed and forwarded, enabling the model to read inline data.
2026-04-14 09:57:28 +00:00 · 2025-12-20 23:23:33 +08:00
226 changed files with 2131 additions and 27460 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

 # 数据库相关配置
 # 数据库连接字符串
@@ -57,9 +49,6 @@
 # 流模式无响应超时时间，单位秒，如果出现空补全可以尝试改为更大值
 # STREAMING_TIMEOUT=300

-# TLS / HTTP 跳过验证设置
-# TLS_INSECURE_SKIP_VERIFY=false
-
 # Gemini 识别图片 最大图片数量
 # GEMINI_VISION_MAX_IMAGE_NUM=16

--- a/.gitignore
+++ b/.gitignore
@@ -16,14 +16,9 @@ new-api
 tiktoken_cache
 .eslintcache
 .gocache
-.gomodcache/
 .cache
 web/bun.lock
-plans

 electron/node_modules
 electron/dist
 data/
-.gomodcache/
-.gocache-temp
-.gopath
--- 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
@@ -213,11 +213,9 @@ docker run --name new-api -d --restart always \
 - 🚦 User-level model rate limiting

 **Format Conversion:**
- 🔄 **OpenAI Compatible ⇄ Claude Messages**
- 🔄 **OpenAI Compatible → Google Gemini**
- 🔄 **Google Gemini → OpenAI Compatible** - Text only, function calling not supported yet
- 🚧 **OpenAI Compatible ⇄ OpenAI Responses** - In development
- 🔄 **Thinking-to-content functionality**
+- 🔄 OpenAI ⇄ Claude Messages
+- 🔄 OpenAI ⇄ Gemini Chat
+- 🔄 Thinking-to-content functionality

 **Reasoning Effort Support:**

@@ -248,16 +246,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 | - |

@@ -266,16 +264,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>

@@ -310,15 +308,8 @@ docker run --name new-api -d --restart always \
 | `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>

@@ -420,10 +411,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

@@ -452,7 +443,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
@@ -212,11 +212,9 @@ docker run --name new-api -d --restart always \
 - 🚦 Limitation du débit du modèle pour les utilisateurs

 **Conversion de format:**
- 🔄 **OpenAI Compatible ⇄ Claude Messages**
- 🔄 **OpenAI Compatible → Google Gemini**
- 🔄 **Google Gemini → OpenAI Compatible** - Texte uniquement, les appels de fonction ne sont pas encore pris en charge
- 🚧 **OpenAI Compatible ⇄ OpenAI Responses** - En développement
- 🔄 **Fonctionnalité de la pensée au contenu**
+- 🔄 OpenAI ⇄ Claude Messages
+- 🔄 OpenAI ⇄ Gemini Chat
+- 🔄 Fonctionnalité de la pensée au contenu

 **Prise en charge de l'effort de raisonnement:**

@@ -244,16 +242,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 | - |

@@ -262,16 +260,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>

@@ -306,15 +304,8 @@ docker run --name new-api -d --restart always \
 | `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>

@@ -414,10 +405,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

@@ -446,7 +437,7 @@ 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>

--- 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）

 **インテリジェントルーティング:**
 - ⚖️ チャネル重み付けランダム
@@ -218,11 +218,9 @@ docker run --name new-api -d --restart always \
 - 🚦 ユーザーレベルモデルレート制限

 **フォーマット変換:**
- 🔄 **OpenAI Compatible ⇄ Claude Messages**
- 🔄 **OpenAI Compatible → Google Gemini**
- 🔄 **Google Gemini → OpenAI Compatible** - テキストのみ、関数呼び出しはまだサポートされていません
- 🚧 **OpenAI Compatible ⇄ OpenAI Responses** - 開発中
- 🔄 **思考からコンテンツへの機能**
+- 🔄 OpenAI ⇄ Claude Messages
+- 🔄 OpenAI ⇄ Gemini Chat
+- 🔄 思考からコンテンツへの機能

 **Reasoning Effort サポート:**

@@ -253,16 +251,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モード | - |
 | 🎯 カスタム | 完全な呼び出しアドレスの入力をサポート | - |

@@ -271,16 +269,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>

@@ -315,15 +313,8 @@ docker run --name new-api -d --restart always \
 | `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>

@@ -423,10 +414,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) |

 ### 🤝 貢献ガイド

@@ -455,7 +446,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）

 **智能路由：**
 - ⚖️ 渠道加权随机
@@ -214,11 +214,9 @@ docker run --name new-api -d --restart always \
 - 🚦 用户级别模型限流

 **格式转换：**
- 🔄 **OpenAI Compatible ⇄ Claude Messages**
- 🔄 **OpenAI Compatible → Google Gemini**
- 🔄 **Google Gemini → OpenAI Compatible** - 仅支持文本，暂不支持函数调用
- 🚧 **OpenAI Compatible ⇄ OpenAI Responses** - 开发中
- 🔄 **思考转内容功能**
+- 🔄 OpenAI ⇄ Claude Messages
+- 🔄 OpenAI ⇄ Gemini Chat
+- 🔄 思考转内容功能

 **Reasoning Effort 支持：**

@@ -249,16 +247,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 模式 | - |
 | 🎯 自定义 | 支持完整调用地址 | - |

@@ -267,16 +265,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>

@@ -311,15 +309,8 @@ docker run --name new-api -d --restart always \
 | `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/zh/docs/installation/config-maintenance/environment-variables)
+📖 **完整配置：** [环境变量文档](https://docs.newapi.pro/installation/environment-variables)

 </details>

@@ -421,10 +412,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) |

 ### 🤝 贡献指南

@@ -453,7 +444,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/api_type.go
+++ b/common/api_type.go
@@ -73,8 +73,6 @@ func ChannelType2APIType(channelType int) (int, bool) {
 		apiType = constant.APITypeMiniMax
 	case constant.ChannelTypeReplicate:
 		apiType = constant.APITypeReplicate
-	case constant.ChannelTypeCodex:
-		apiType = constant.APITypeCodex
 	}
 	if apiType == -1 {
 		return constant.APITypeOpenAI, false
--- a/common/constants.go
+++ b/common/constants.go
@@ -1,7 +1,6 @@
 package common

 import (
-	"crypto/tls"
 	//"os"
 	//"strconv"
 	"sync"
@@ -74,9 +73,6 @@ var MemoryCacheEnabled bool

 var LogConsumeEnabled = true

-var TLSInsecureSkipVerify bool
-var InsecureTLSConfig = &tls.Config{InsecureSkipVerify: true}
-
 var SMTPServer = ""
 var SMTPPort = 587
 var SMTPSSLEnabled = false
--- a/common/endpoint_defaults.go
+++ b/common/endpoint_defaults.go
@@ -17,14 +17,13 @@ type EndpointInfo struct {

 // defaultEndpointInfoMap 保存内置端点的默认 Path 与 Method
 var defaultEndpointInfoMap = map[constant.EndpointType]EndpointInfo{
-	constant.EndpointTypeOpenAI:                {Path: "/v1/chat/completions", Method: "POST"},
-	constant.EndpointTypeOpenAIResponse:        {Path: "/v1/responses", Method: "POST"},
-	constant.EndpointTypeOpenAIResponseCompact: {Path: "/v1/responses/compact", Method: "POST"},
-	constant.EndpointTypeAnthropic:             {Path: "/v1/messages", Method: "POST"},
-	constant.EndpointTypeGemini:                {Path: "/v1beta/models/{model}:generateContent", Method: "POST"},
-	constant.EndpointTypeJinaRerank:            {Path: "/v1/rerank", Method: "POST"},
-	constant.EndpointTypeImageGeneration:       {Path: "/v1/images/generations", Method: "POST"},
-	constant.EndpointTypeEmbeddings:            {Path: "/v1/embeddings", Method: "POST"},
+	constant.EndpointTypeOpenAI:          {Path: "/v1/chat/completions", Method: "POST"},
+	constant.EndpointTypeOpenAIResponse:  {Path: "/v1/responses", Method: "POST"},
+	constant.EndpointTypeAnthropic:       {Path: "/v1/messages", Method: "POST"},
+	constant.EndpointTypeGemini:          {Path: "/v1beta/models/{model}:generateContent", Method: "POST"},
+	constant.EndpointTypeJinaRerank:      {Path: "/rerank", Method: "POST"},
+	constant.EndpointTypeImageGeneration: {Path: "/v1/images/generations", Method: "POST"},
+	constant.EndpointTypeEmbeddings:      {Path: "/v1/embeddings", Method: "POST"},
 }

 // GetDefaultEndpointInfo 返回指定端点类型的默认信息以及是否存在
--- a/common/gin.go
+++ b/common/gin.go
@@ -40,7 +40,7 @@ func GetRequestBody(c *gin.Context) ([]byte, error) {
 		}
 	}
 	maxMB := constant.MaxRequestBodyMB
-	if maxMB <= 0 {
+	if maxMB < 0 {
 		// no limit
 		body, err := io.ReadAll(c.Request.Body)
 		_ = c.Request.Body.Close()
--- a/common/init.go
+++ b/common/init.go
@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"log"
-	"net/http"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -82,16 +81,6 @@ func InitEnv() {
 	DebugEnabled = os.Getenv("DEBUG") == "true"
 	MemoryCacheEnabled = os.Getenv("MEMORY_CACHE_ENABLED") == "true"
 	IsMasterNode = os.Getenv("NODE_TYPE") != "slave"
-	TLSInsecureSkipVerify = GetEnvOrDefaultBool("TLS_INSECURE_SKIP_VERIFY", false)
-	if TLSInsecureSkipVerify {
-		if tr, ok := http.DefaultTransport.(*http.Transport); ok && tr != nil {
-			if tr.TLSClientConfig != nil {
-				tr.TLSClientConfig.InsecureSkipVerify = true
-			} else {
-				tr.TLSClientConfig = InsecureTLSConfig
-			}
-		}
-	}

 	// Parse requestInterval and set RequestInterval
 	requestInterval, _ = strconv.Atoi(os.Getenv("POLLING_INTERVAL"))
@@ -126,10 +115,10 @@ 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.MaxFileDownloadMB = GetEnvOrDefault("MAX_FILE_DOWNLOAD_MB", 20)
 	constant.StreamScannerMaxBufferMB = GetEnvOrDefault("STREAM_SCANNER_MAX_BUFFER_MB", 64)
 	// MaxRequestBodyMB 请求体最大大小（解压后），用于防止超大请求/zip bomb导致内存暴涨
-	constant.MaxRequestBodyMB = GetEnvOrDefault("MAX_REQUEST_BODY_MB", 128)
+	constant.MaxRequestBodyMB = GetEnvOrDefault("MAX_REQUEST_BODY_MB", 64)
 	// ForceStreamOption 覆盖请求参数，强制返回usage信息
 	constant.ForceStreamOption = GetEnvOrDefaultBool("FORCE_STREAM_OPTION", true)
 	constant.CountToken = GetEnvOrDefaultBool("CountToken", true)
--- 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/str.go
+++ b/common/str.go
@@ -16,8 +16,6 @@ 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`)
-	// maskApiKeyPattern matches patterns like 'api_key:xxx' or "api_key:xxx" to mask the API key value
-	maskApiKeyPattern = regexp.MustCompile(`(['"]?)api_key:([^\s'"]+)(['"]?)`)
 )

 func GetStringIfEmpty(str string, defaultValue string) string {
@@ -237,8 +235,5 @@ func MaskSensitiveInfo(str string) string {
 	// Mask IP addresses
 	str = maskIPPattern.ReplaceAllString(str, "***.***.***.***")

-	// Mask API keys (e.g., "api_key:AIzaSyAAAaUooTUni8AdaOkSRMda30n_Q4vrV70" -> "api_key:***")
-	str = maskApiKeyPattern.ReplaceAllString(str, "${1}api_key:***${3}")
-
 	return str
 }
--- a/common/utils.go
+++ b/common/utils.go
@@ -263,7 +263,7 @@ func GetTimestamp() int64 {
 }

 func GetTimeString() string {
-	now := time.Now().UTC()
+	now := time.Now()
 	return fmt.Sprintf("%s%d", now.Format("20060102150405"), now.UnixNano()%1e9)
 }

--- a/constant/api_type.go
+++ b/constant/api_type.go
@@ -35,6 +35,5 @@ const (
 	APITypeSubmodel
 	APITypeMiniMax
 	APITypeReplicate
-	APITypeCodex
 	APITypeDummy // this one is only for count, do not add any channel after this
 )
--- a/constant/channel.go
+++ b/constant/channel.go
@@ -54,7 +54,6 @@ const (
 	ChannelTypeDoubaoVideo    = 54
 	ChannelTypeSora           = 55
 	ChannelTypeReplicate      = 56
-	ChannelTypeCodex          = 57
 	ChannelTypeDummy          // this one is only for count, do not add any channel after this

 )
@@ -117,7 +116,6 @@ var ChannelBaseURLs = []string{
 	"https://ark.cn-beijing.volces.com",         //54
 	"https://api.openai.com",                    //55
 	"https://api.replicate.com",                 //56
-	"https://chatgpt.com",                       //57
 }

 var ChannelTypeNames = map[int]string{
@@ -174,7 +172,6 @@ var ChannelTypeNames = map[int]string{
 	ChannelTypeDoubaoVideo:    "DoubaoVideo",
 	ChannelTypeSora:           "Sora",
 	ChannelTypeReplicate:      "Replicate",
-	ChannelTypeCodex:          "Codex",
 }

 func GetChannelTypeName(channelType int) string {
--- a/constant/context_key.go
+++ b/constant/context_key.go
@@ -55,8 +55,4 @@ const (
 	ContextKeyLocalCountTokens ContextKey = "local_count_tokens"

 	ContextKeySystemPromptOverride ContextKey = "system_prompt_override"
-
-	// ContextKeyAdminRejectReason stores an admin-only reject/block reason extracted from upstream responses.
-	// It is not returned to end users, but can be persisted into consume/error logs for debugging.
-	ContextKeyAdminRejectReason ContextKey = "admin_reject_reason"
 )
--- a/constant/endpoint_type.go
+++ b/constant/endpoint_type.go
@@ -3,15 +3,14 @@ package constant
 type EndpointType string

 const (
-	EndpointTypeOpenAI                EndpointType = "openai"
-	EndpointTypeOpenAIResponse        EndpointType = "openai-response"
-	EndpointTypeOpenAIResponseCompact EndpointType = "openai-response-compact"
-	EndpointTypeAnthropic             EndpointType = "anthropic"
-	EndpointTypeGemini                EndpointType = "gemini"
-	EndpointTypeJinaRerank            EndpointType = "jina-rerank"
-	EndpointTypeImageGeneration       EndpointType = "image-generation"
-	EndpointTypeEmbeddings            EndpointType = "embeddings"
-	EndpointTypeOpenAIVideo           EndpointType = "openai-video"
+	EndpointTypeOpenAI          EndpointType = "openai"
+	EndpointTypeOpenAIResponse  EndpointType = "openai-response"
+	EndpointTypeAnthropic       EndpointType = "anthropic"
+	EndpointTypeGemini          EndpointType = "gemini"
+	EndpointTypeJinaRerank      EndpointType = "jina-rerank"
+	EndpointTypeImageGeneration EndpointType = "image-generation"
+	EndpointTypeEmbeddings      EndpointType = "embeddings"
+	EndpointTypeOpenAIVideo     EndpointType = "openai-video"
 	//EndpointTypeMidjourney     EndpointType = "midjourney-proxy"
 	//EndpointTypeSuno           EndpointType = "suno-proxy"
 	//EndpointTypeKling          EndpointType = "kling"
--- a/controller/channel-test.go
+++ b/controller/channel-test.go
@@ -26,7 +26,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/helper"
 	"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/bytedance/gopkg/util/gopool"
@@ -85,11 +84,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		}
 	} else {
 		// 如果没有指定端点类型，使用原有的自动检测逻辑
-
-		if strings.Contains(strings.ToLower(testModel), "rerank") {
-			requestPath = "/v1/rerank"
-		}
-
 		// 先判断是否为 Embedding 模型
 		if strings.Contains(strings.ToLower(testModel), "embedding") ||
 			strings.HasPrefix(testModel, "m3e") || // m3e 系列模型
@@ -103,19 +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"
-		}
-
-		// responses compaction models (must use /v1/responses/compact)
-		if strings.HasSuffix(testModel, ratio_setting.CompactModelSuffix) {
-			requestPath = "/v1/responses/compact"
-		}
-	}
-	if strings.HasPrefix(requestPath, "/v1/responses/compact") {
-		testModel = ratio_setting.WithCompactModelSuffix(testModel)
 	}

 	c.Request = &http.Request{
@@ -159,8 +140,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 			relayFormat = types.RelayFormatOpenAI
 		case constant.EndpointTypeOpenAIResponse:
 			relayFormat = types.RelayFormatOpenAIResponses
-		case constant.EndpointTypeOpenAIResponseCompact:
-			relayFormat = types.RelayFormatOpenAIResponsesCompaction
 		case constant.EndpointTypeAnthropic:
 			relayFormat = types.RelayFormatClaude
 		case constant.EndpointTypeGemini:
@@ -195,12 +174,9 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		if c.Request.URL.Path == "/v1/responses" {
 			relayFormat = types.RelayFormatOpenAIResponses
 		}
-		if strings.HasPrefix(c.Request.URL.Path, "/v1/responses/compact") {
-			relayFormat = types.RelayFormatOpenAIResponsesCompaction
-		}
 	}

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

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

@@ -212,7 +188,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 		}
 	}

-	info.IsChannelTest = true
 	info.InitChannelMeta(c)

 	err = helper.ModelMappedHelper(c, info, request)
@@ -229,15 +204,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 	request.SetModelName(testModel)

 	apiType, _ := common.ChannelType2APIType(channel.Type)
-	if info.RelayMode == relayconstant.RelayModeResponsesCompact &&
-		apiType != constant.APITypeOpenAI &&
-		apiType != constant.APITypeCodex {
-		return testResult{
-			context:     c,
-			localErr:    fmt.Errorf("responses compaction test only supports openai/codex channels, got api type %d", apiType),
-			newAPIError: types.NewError(fmt.Errorf("unsupported api type: %d", apiType), types.ErrorCodeInvalidApiType),
-		}
-	}
 	adaptor := relay.GetAdaptor(apiType)
 	if adaptor == nil {
 		return testResult{
@@ -310,25 +276,6 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 				newAPIError: types.NewError(errors.New("invalid response request type"), types.ErrorCodeConvertRequestFailed),
 			}
 		}
-	case relayconstant.RelayModeResponsesCompact:
-		// Response compaction request - convert to OpenAIResponsesRequest before adapting
-		switch req := request.(type) {
-		case *dto.OpenAIResponsesCompactionRequest:
-			convertedRequest, err = adaptor.ConvertOpenAIResponsesRequest(c, info, dto.OpenAIResponsesRequest{
-				Model:              req.Model,
-				Input:              req.Input,
-				Instructions:       req.Instructions,
-				PreviousResponseID: req.PreviousResponseID,
-			})
-		case *dto.OpenAIResponsesRequest:
-			convertedRequest, err = adaptor.ConvertOpenAIResponsesRequest(c, info, *req)
-		default:
-			return testResult{
-				context:     c,
-				localErr:    errors.New("invalid response compaction request type"),
-				newAPIError: types.NewError(errors.New("invalid response compaction request type"), types.ErrorCodeConvertRequestFailed),
-			}
-		}
 	default:
 		// Chat/Completion 等其他请求类型
 		if generalReq, ok := request.(*dto.GeneralOpenAIRequest); ok {
@@ -357,29 +304,8 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 			newAPIError: types.NewError(err, types.ErrorCodeJsonMarshalFailed),
 		}
 	}
-
-	//jsonData, err = relaycommon.RemoveDisabledFields(jsonData, info.ChannelOtherSettings)
-	//if err != nil {
-	//	return testResult{
-	//		context:     c,
-	//		localErr:    err,
-	//		newAPIError: types.NewError(err, types.ErrorCodeConvertRequestFailed),
-	//	}
-	//}
-
-	if len(info.ParamOverride) > 0 {
-		jsonData, err = relaycommon.ApplyParamOverride(jsonData, info.ParamOverride, relaycommon.BuildParamOverrideContext(info))
-		if err != nil {
-			return testResult{
-				context:     c,
-				localErr:    err,
-				newAPIError: types.NewError(err, types.ErrorCodeChannelParamOverrideInvalid),
-			}
-		}
-	}
-
 	requestBody := bytes.NewBuffer(jsonData)
-	c.Request.Body = io.NopCloser(bytes.NewBuffer(jsonData))
+	c.Request.Body = io.NopCloser(requestBody)
 	resp, err := adaptor.DoRequest(c, info, requestBody)
 	if err != nil {
 		return testResult{
@@ -393,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,
@@ -473,9 +389,7 @@ func testChannel(channel *model.Channel, testModel string, endpointType string)
 	}
 }

-func buildTestRequest(model string, endpointType string, channel *model.Channel) dto.Request {
-	testResponsesInput := json.RawMessage(`[{"role":"user","content":"hi"}]`)
-
+func buildTestRequest(model string, endpointType string) dto.Request {
 	// 根据端点类型构建不同的测试请求
 	if endpointType != "" {
 		switch constant.EndpointType(endpointType) {
@@ -505,17 +419,11 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 			// 返回 OpenAIResponsesRequest
 			return &dto.OpenAIResponsesRequest{
 				Model: model,
-				Input: json.RawMessage(`[{"role":"user","content":"hi"}]`),
-			}
-		case constant.EndpointTypeOpenAIResponseCompact:
-			// 返回 OpenAIResponsesCompactionRequest
-			return &dto.OpenAIResponsesCompactionRequest{
-				Model: model,
-				Input: testResponsesInput,
+				Input: json.RawMessage("\"hi\""),
 			}
 		case constant.EndpointTypeAnthropic, constant.EndpointTypeGemini, constant.EndpointTypeOpenAI:
 			// 返回 GeneralOpenAIRequest
-			maxTokens := uint(16)
+			maxTokens := uint(10)
 			if constant.EndpointType(endpointType) == constant.EndpointTypeGemini {
 				maxTokens = 3000
 			}
@@ -534,15 +442,6 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 	}

 	// 自动检测逻辑（保持原有行为）
-	if strings.Contains(strings.ToLower(model), "rerank") {
-		return &dto.RerankRequest{
-			Model:     model,
-			Query:     "What is Deep Learning?",
-			Documents: []any{"Deep Learning is a subset of machine learning.", "Machine learning is a field of artificial intelligence."},
-			TopN:      2,
-		}
-	}
-
 	// 先判断是否为 Embedding 模型
 	if strings.Contains(strings.ToLower(model), "embedding") ||
 		strings.HasPrefix(model, "m3e") ||
@@ -554,22 +453,6 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel)
 		}
 	}

-	// Responses compaction models (must use /v1/responses/compact)
-	if strings.HasSuffix(model, ratio_setting.CompactModelSuffix) {
-		return &dto.OpenAIResponsesCompactionRequest{
-			Model: model,
-			Input: testResponsesInput,
-		}
-	}
-
-	// Responses-only models (e.g. codex series)
-	if strings.Contains(strings.ToLower(model), "codex") {
-		return &dto.OpenAIResponsesRequest{
-			Model: model,
-			Input: json.RawMessage(`[{"role":"user","content":"hi"}]`),
-		}
-	}
-
 	// Chat/Completion 请求 - 返回 GeneralOpenAIRequest
 	testRequest := &dto.GeneralOpenAIRequest{
 		Model:  model,
@@ -583,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
@@ -591,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
@@ -1,31 +1,26 @@
 package controller

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

 	"github.com/QuantumNous/new-api/common"
 	"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/gemini"
-	"github.com/QuantumNous/new-api/relay/channel/ollama"
 	"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"`
@@ -212,88 +207,11 @@ 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
-	}
-
-	// 对于 Gemini 渠道，使用特殊处理
-	if channel.Type == constant.ChannelTypeGemini {
-		// 获取用于请求的可用密钥（多密钥渠道优先使用启用状态的密钥）
-		key, _, apiErr := channel.GetNextEnabledKey()
-		if apiErr != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("获取渠道密钥失败: %s", apiErr.Error()),
-			})
-			return
-		}
-		key = strings.TrimSpace(key)
-		models, err := gemini.FetchGeminiModels(baseURL, key, channel.GetSetting().Proxy)
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("获取Gemini模型失败: %s", err.Error()),
-			})
-			return
-		}
-
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"message": "",
-			"data":    models,
-		})
-		return
-	}
-
 	var url string
 	switch channel.Type {
+	case constant.ChannelTypeGemini:
+		// curl https://example.com/v1beta/models?key=$GEMINI_API_KEY
+		url = fmt.Sprintf("%s/v1beta/openai/models", baseURL) // Remove key in url since we need to use AuthHeader
 	case constant.ChannelTypeAli:
 		url = fmt.Sprintf("%s/compatible-mode/v1/models", baseURL)
 	case constant.ChannelTypeZhipu_v4:
@@ -606,60 +524,9 @@ func validateChannel(channel *model.Channel, isAdd bool) error {
 		}
 	}

-	// Codex OAuth key validation (optional, only when JSON object is provided)
-	if channel.Type == constant.ChannelTypeCodex {
-		trimmedKey := strings.TrimSpace(channel.Key)
-		if isAdd || trimmedKey != "" {
-			if !strings.HasPrefix(trimmedKey, "{") {
-				return fmt.Errorf("Codex key must be a valid JSON object")
-			}
-			var keyMap map[string]any
-			if err := common.Unmarshal([]byte(trimmedKey), &keyMap); err != nil {
-				return fmt.Errorf("Codex key must be a valid JSON object")
-			}
-			if v, ok := keyMap["access_token"]; !ok || v == nil || strings.TrimSpace(fmt.Sprintf("%v", v)) == "" {
-				return fmt.Errorf("Codex key JSON must include access_token")
-			}
-			if v, ok := keyMap["account_id"]; !ok || v == nil || strings.TrimSpace(fmt.Sprintf("%v", v)) == "" {
-				return fmt.Errorf("Codex key JSON must include account_id")
-			}
-		}
-	}
-
 	return nil
 }

-func RefreshCodexChannelCredential(c *gin.Context) {
-	channelId, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		common.ApiError(c, fmt.Errorf("invalid channel id: %w", err))
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(c.Request.Context(), 10*time.Second)
-	defer cancel()
-
-	oauthKey, ch, err := service.RefreshCodexChannelCredential(ctx, channelId, service.CodexCredentialRefreshOptions{ResetCaches: true})
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "refreshed",
-		"data": gin.H{
-			"expires_at":   oauthKey.Expired,
-			"last_refresh": oauthKey.LastRefresh,
-			"account_id":   oauthKey.AccountID,
-			"email":        oauthKey.Email,
-			"channel_id":   ch.Id,
-			"channel_type": ch.Type,
-			"channel_name": ch.Name,
-		},
-	})
-}
-
 type AddChannelRequest struct {
 	Mode                      string                `json:"mode"`
 	MultiKeyMode              constant.MultiKeyMode `json:"multi_key_mode"`
@@ -1050,6 +917,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")
@@ -1059,31 +929,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":
 			// 覆盖模式：直接使用新密钥（默认行为，不需要特殊处理）
@@ -1126,49 +975,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
-	}
-
-	if req.Type == constant.ChannelTypeGemini {
-		models, err := gemini.FetchGeminiModels(baseURL, key, "")
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": fmt.Sprintf("获取Gemini模型失败: %s", err.Error()),
-			})
-			return
-		}
-
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"data":    models,
-		})
-		return
-	}
-
 	client := &http.Client{}
 	url := fmt.Sprintf("%s/v1/models", baseURL)

@@ -1181,6 +987,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)
@@ -1830,262 +1640,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/channel_affinity_cache.go
+++ b/controller/channel_affinity_cache.go
@@ -1,60 +0,0 @@
-package controller
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/QuantumNous/new-api/service"
-	"github.com/gin-gonic/gin"
-)
-
-func GetChannelAffinityCacheStats(c *gin.Context) {
-	stats := service.GetChannelAffinityCacheStats()
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "",
-		"data":    stats,
-	})
-}
-
-func ClearChannelAffinityCache(c *gin.Context) {
-	all := strings.TrimSpace(c.Query("all"))
-	ruleName := strings.TrimSpace(c.Query("rule_name"))
-
-	if all == "true" {
-		deleted := service.ClearChannelAffinityCacheAll()
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"message": "",
-			"data": gin.H{
-				"deleted": deleted,
-			},
-		})
-		return
-	}
-
-	if ruleName == "" {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": "缺少参数：rule_name，或使用 all=true 清空全部",
-		})
-		return
-	}
-
-	deleted, err := service.ClearChannelAffinityCacheByRuleName(ruleName)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "",
-		"data": gin.H{
-			"deleted": deleted,
-		},
-	})
-}
--- 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/codex_oauth.go
+++ b/controller/codex_oauth.go
@@ -1,243 +0,0 @@
-package controller
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/constant"
-	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/relay/channel/codex"
-	"github.com/QuantumNous/new-api/service"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-gonic/gin"
-)
-
-type codexOAuthCompleteRequest struct {
-	Input string `json:"input"`
-}
-
-func codexOAuthSessionKey(channelID int, field string) string {
-	return fmt.Sprintf("codex_oauth_%s_%d", field, channelID)
-}
-
-func parseCodexAuthorizationInput(input string) (code string, state string, err error) {
-	v := strings.TrimSpace(input)
-	if v == "" {
-		return "", "", errors.New("empty input")
-	}
-	if strings.Contains(v, "#") {
-		parts := strings.SplitN(v, "#", 2)
-		code = strings.TrimSpace(parts[0])
-		state = strings.TrimSpace(parts[1])
-		return code, state, nil
-	}
-	if strings.Contains(v, "code=") {
-		u, parseErr := url.Parse(v)
-		if parseErr == nil {
-			q := u.Query()
-			code = strings.TrimSpace(q.Get("code"))
-			state = strings.TrimSpace(q.Get("state"))
-			return code, state, nil
-		}
-		q, parseErr := url.ParseQuery(v)
-		if parseErr == nil {
-			code = strings.TrimSpace(q.Get("code"))
-			state = strings.TrimSpace(q.Get("state"))
-			return code, state, nil
-		}
-	}
-
-	code = v
-	return code, "", nil
-}
-
-func StartCodexOAuth(c *gin.Context) {
-	startCodexOAuthWithChannelID(c, 0)
-}
-
-func StartCodexOAuthForChannel(c *gin.Context) {
-	channelID, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		common.ApiError(c, fmt.Errorf("invalid channel id: %w", err))
-		return
-	}
-	startCodexOAuthWithChannelID(c, channelID)
-}
-
-func startCodexOAuthWithChannelID(c *gin.Context, channelID int) {
-	if channelID > 0 {
-		ch, err := model.GetChannelById(channelID, false)
-		if err != nil {
-			common.ApiError(c, err)
-			return
-		}
-		if ch == nil {
-			c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel not found"})
-			return
-		}
-		if ch.Type != constant.ChannelTypeCodex {
-			c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel type is not Codex"})
-			return
-		}
-	}
-
-	flow, err := service.CreateCodexOAuthAuthorizationFlow()
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	session := sessions.Default(c)
-	session.Set(codexOAuthSessionKey(channelID, "state"), flow.State)
-	session.Set(codexOAuthSessionKey(channelID, "verifier"), flow.Verifier)
-	session.Set(codexOAuthSessionKey(channelID, "created_at"), time.Now().Unix())
-	_ = session.Save()
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "",
-		"data": gin.H{
-			"authorize_url": flow.AuthorizeURL,
-		},
-	})
-}
-
-func CompleteCodexOAuth(c *gin.Context) {
-	completeCodexOAuthWithChannelID(c, 0)
-}
-
-func CompleteCodexOAuthForChannel(c *gin.Context) {
-	channelID, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		common.ApiError(c, fmt.Errorf("invalid channel id: %w", err))
-		return
-	}
-	completeCodexOAuthWithChannelID(c, channelID)
-}
-
-func completeCodexOAuthWithChannelID(c *gin.Context, channelID int) {
-	req := codexOAuthCompleteRequest{}
-	if err := c.ShouldBindJSON(&req); err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	code, state, err := parseCodexAuthorizationInput(req.Input)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-		return
-	}
-	if strings.TrimSpace(code) == "" {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "missing authorization code"})
-		return
-	}
-	if strings.TrimSpace(state) == "" {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "missing state in input"})
-		return
-	}
-
-	if channelID > 0 {
-		ch, err := model.GetChannelById(channelID, false)
-		if err != nil {
-			common.ApiError(c, err)
-			return
-		}
-		if ch == nil {
-			c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel not found"})
-			return
-		}
-		if ch.Type != constant.ChannelTypeCodex {
-			c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel type is not Codex"})
-			return
-		}
-	}
-
-	session := sessions.Default(c)
-	expectedState, _ := session.Get(codexOAuthSessionKey(channelID, "state")).(string)
-	verifier, _ := session.Get(codexOAuthSessionKey(channelID, "verifier")).(string)
-	if strings.TrimSpace(expectedState) == "" || strings.TrimSpace(verifier) == "" {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "oauth flow not started or session expired"})
-		return
-	}
-	if state != expectedState {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "state mismatch"})
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(c.Request.Context(), 15*time.Second)
-	defer cancel()
-
-	tokenRes, err := service.ExchangeCodexAuthorizationCode(ctx, code, verifier)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-		return
-	}
-
-	accountID, ok := service.ExtractCodexAccountIDFromJWT(tokenRes.AccessToken)
-	if !ok {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "failed to extract account_id from access_token"})
-		return
-	}
-	email, _ := service.ExtractEmailFromJWT(tokenRes.AccessToken)
-
-	key := codex.OAuthKey{
-		AccessToken:  tokenRes.AccessToken,
-		RefreshToken: tokenRes.RefreshToken,
-		AccountID:    accountID,
-		LastRefresh:  time.Now().Format(time.RFC3339),
-		Expired:      tokenRes.ExpiresAt.Format(time.RFC3339),
-		Email:        email,
-		Type:         "codex",
-	}
-	encoded, err := common.Marshal(key)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	session.Delete(codexOAuthSessionKey(channelID, "state"))
-	session.Delete(codexOAuthSessionKey(channelID, "verifier"))
-	session.Delete(codexOAuthSessionKey(channelID, "created_at"))
-	_ = session.Save()
-
-	if channelID > 0 {
-		if err := model.DB.Model(&model.Channel{}).Where("id = ?", channelID).Update("key", string(encoded)).Error; err != nil {
-			common.ApiError(c, err)
-			return
-		}
-		model.InitChannelCache()
-		service.ResetProxyClientCache()
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"message": "saved",
-			"data": gin.H{
-				"channel_id":   channelID,
-				"account_id":   accountID,
-				"email":        email,
-				"expires_at":   key.Expired,
-				"last_refresh": key.LastRefresh,
-			},
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "generated",
-		"data": gin.H{
-			"key":          string(encoded),
-			"account_id":   accountID,
-			"email":        email,
-			"expires_at":   key.Expired,
-			"last_refresh": key.LastRefresh,
-		},
-	})
-}
--- a/controller/codex_usage.go
+++ b/controller/codex_usage.go
@@ -1,124 +0,0 @@
-package controller
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/constant"
-	"github.com/QuantumNous/new-api/model"
-	"github.com/QuantumNous/new-api/relay/channel/codex"
-	"github.com/QuantumNous/new-api/service"
-
-	"github.com/gin-gonic/gin"
-)
-
-func GetCodexChannelUsage(c *gin.Context) {
-	channelId, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		common.ApiError(c, fmt.Errorf("invalid channel id: %w", err))
-		return
-	}
-
-	ch, err := model.GetChannelById(channelId, true)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-	if ch == nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel not found"})
-		return
-	}
-	if ch.Type != constant.ChannelTypeCodex {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "channel type is not Codex"})
-		return
-	}
-	if ch.ChannelInfo.IsMultiKey {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "multi-key channel is not supported"})
-		return
-	}
-
-	oauthKey, err := codex.ParseOAuthKey(strings.TrimSpace(ch.Key))
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-		return
-	}
-	accessToken := strings.TrimSpace(oauthKey.AccessToken)
-	accountID := strings.TrimSpace(oauthKey.AccountID)
-	if accessToken == "" {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "codex channel: access_token is required"})
-		return
-	}
-	if accountID == "" {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": "codex channel: account_id is required"})
-		return
-	}
-
-	client, err := service.NewProxyHttpClient(ch.GetSetting().Proxy)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(c.Request.Context(), 15*time.Second)
-	defer cancel()
-
-	statusCode, body, err := service.FetchCodexWhamUsage(ctx, client, ch.GetBaseURL(), accessToken, accountID)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-		return
-	}
-
-	if (statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden) && strings.TrimSpace(oauthKey.RefreshToken) != "" {
-		refreshCtx, refreshCancel := context.WithTimeout(c.Request.Context(), 10*time.Second)
-		defer refreshCancel()
-
-		res, refreshErr := service.RefreshCodexOAuthToken(refreshCtx, oauthKey.RefreshToken)
-		if refreshErr == nil {
-			oauthKey.AccessToken = res.AccessToken
-			oauthKey.RefreshToken = res.RefreshToken
-			oauthKey.LastRefresh = time.Now().Format(time.RFC3339)
-			oauthKey.Expired = res.ExpiresAt.Format(time.RFC3339)
-			if strings.TrimSpace(oauthKey.Type) == "" {
-				oauthKey.Type = "codex"
-			}
-
-			encoded, encErr := common.Marshal(oauthKey)
-			if encErr == nil {
-				_ = model.DB.Model(&model.Channel{}).Where("id = ?", ch.Id).Update("key", string(encoded)).Error
-				model.InitChannelCache()
-				service.ResetProxyClientCache()
-			}
-
-			ctx2, cancel2 := context.WithTimeout(c.Request.Context(), 15*time.Second)
-			defer cancel2()
-			statusCode, body, err = service.FetchCodexWhamUsage(ctx2, client, ch.GetBaseURL(), oauthKey.AccessToken, accountID)
-			if err != nil {
-				c.JSON(http.StatusOK, gin.H{"success": false, "message": err.Error()})
-				return
-			}
-		}
-	}
-
-	var payload any
-	if json.Unmarshal(body, &payload) != nil {
-		payload = string(body)
-	}
-
-	ok := statusCode >= 200 && statusCode < 300
-	resp := gin.H{
-		"success":         ok,
-		"message":         "",
-		"upstream_status": statusCode,
-		"data":            payload,
-	}
-	if !ok {
-		resp["message"] = fmt.Sprintf("upstream status: %d", statusCode)
-	}
-	c.JSON(http.StatusOK, resp)
-}
--- 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/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_sync.go
+++ b/controller/model_sync.go
@@ -99,9 +99,6 @@ func newHTTPClient() *http.Client {
 		ExpectContinueTimeout: 1 * time.Second,
 		ResponseHeaderTimeout: time.Duration(timeoutSec) * time.Second,
 	}
-	if common.TLSInsecureSkipVerify {
-		transport.TLSClientConfig = common.InsecureTLSConfig
-	}
 	transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		host, _, err := net.SplitHostPort(addr)
 		if err != nil {
@@ -118,17 +115,7 @@ func newHTTPClient() *http.Client {
 	return &http.Client{Transport: transport}
 }

-var (
-	httpClientOnce sync.Once
-	httpClient     *http.Client
-)
-
-func getHTTPClient() *http.Client {
-	httpClientOnce.Do(func() {
-		httpClient = newHTTPClient()
-	})
-	return httpClient
-}
+var httpClient = newHTTPClient()

 func fetchJSON[T any](ctx context.Context, url string, out *upstreamEnvelope[T]) error {
 	var lastErr error
@@ -151,7 +138,7 @@ func fetchJSON[T any](ctx context.Context, url string, out *upstreamEnvelope[T])
 		}
 		cacheMutex.RUnlock()

-		resp, err := getHTTPClient().Do(req)
+		resp, err := httpClient.Do(req)
 		if err != nil {
 			lastErr = err
 			// backoff with jitter
@@ -262,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
 	// 允许空体
@@ -275,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
 	}

@@ -344,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
@@ -10,7 +10,6 @@ import (
 	"github.com/QuantumNous/new-api/model"
 	"github.com/QuantumNous/new-api/setting"
 	"github.com/QuantumNous/new-api/setting/console_setting"
-	"github.com/QuantumNous/new-api/setting/operation_setting"
 	"github.com/QuantumNous/new-api/setting/ratio_setting"
 	"github.com/QuantumNous/new-api/setting/system_setting"

@@ -21,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{
@@ -178,24 +173,6 @@ func UpdateOption(c *gin.Context) {
 			})
 			return
 		}
-	case "AutomaticDisableStatusCodes":
-		_, err = operation_setting.ParseHTTPStatusCodeRanges(option.Value.(string))
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": err.Error(),
-			})
-			return
-		}
-	case "AutomaticRetryStatusCodes":
-		_, err = operation_setting.ParseHTTPStatusCodeRanges(option.Value.(string))
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": err.Error(),
-			})
-			return
-		}
 	case "console_setting.api_info":
 		err = console_setting.ValidateConsoleSettings(option.Value.(string), "ApiInfo")
 		if err != nil {
--- a/controller/ratio_sync.go
+++ b/controller/ratio_sync.go
@@ -11,7 +11,6 @@ import (
 	"sync"
 	"time"

-	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/logger"

 	"github.com/QuantumNous/new-api/dto"
@@ -111,9 +110,6 @@ func FetchUpstreamRatios(c *gin.Context) {

 	dialer := &net.Dialer{Timeout: 10 * time.Second}
 	transport := &http.Transport{MaxIdleConns: 100, IdleConnTimeout: 90 * time.Second, TLSHandshakeTimeout: 10 * time.Second, ExpectContinueTimeout: 1 * time.Second, ResponseHeaderTimeout: 10 * time.Second}
-	if common.TLSInsecureSkipVerify {
-		transport.TLSClientConfig = common.InsecureTLSConfig
-	}
 	transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 		host, _, err := net.SplitHostPort(addr)
 		if err != nil {
--- a/controller/relay.go
+++ b/controller/relay.go
@@ -21,7 +21,6 @@ import (
 	"github.com/QuantumNous/new-api/relay/helper"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting"
-	"github.com/QuantumNous/new-api/setting/operation_setting"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/bytedance/gopkg/util/gopool"
@@ -45,7 +44,7 @@ func relayHandler(c *gin.Context, info *relaycommon.RelayInfo) *types.NewAPIErro
 		err = relay.RerankHelper(c, info)
 	case relayconstant.RelayModeEmbeddings:
 		err = relay.EmbeddingHelper(c, info)
-	case relayconstant.RelayModeResponses, relayconstant.RelayModeResponsesCompact:
+	case relayconstant.RelayModeResponses:
 		err = relay.ResponsesHelper(c, info)
 	default:
 		err = relay.TextHelper(c, info)
@@ -167,12 +166,8 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {

 	defer func() {
 		// Only return quota if downstream failed and quota was actually pre-consumed
-		if newAPIError != nil {
-			newAPIError = service.NormalizeViolationFeeError(newAPIError)
-			if relayInfo.FinalPreConsumedQuota != 0 {
-				service.ReturnPreConsumedQuota(c, relayInfo)
-			}
-			service.ChargeViolationFeeIfNeeded(c, relayInfo, newAPIError)
+		if newAPIError != nil && relayInfo.FinalPreConsumedQuota != 0 {
+			service.ReturnPreConsumedQuota(c, relayInfo)
 		}
 	}()

@@ -219,8 +214,6 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
 			return
 		}

-		newAPIError = service.NormalizeViolationFeeError(newAPIError)
-
 		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()) {
@@ -323,14 +316,30 @@ func shouldRetry(c *gin.Context, openaiErr *types.NewAPIError, retryTimes int) b
 	if _, ok := c.Get("specific_channel_id"); ok {
 		return false
 	}
-	code := openaiErr.StatusCode
-	if code >= 200 && code < 300 {
-		return false
-	}
-	if code < 100 || code > 599 {
+	if openaiErr.StatusCode == http.StatusTooManyRequests {
 		return true
 	}
-	return operation_setting.ShouldRetryByStatusCode(code)
+	if openaiErr.StatusCode == 307 {
+		return true
+	}
+	if openaiErr.StatusCode/100 == 5 {
+		// 超时不重试
+		if openaiErr.StatusCode == 504 || openaiErr.StatusCode == 524 {
+			return false
+		}
+		return true
+	}
+	if openaiErr.StatusCode == http.StatusBadRequest {
+		return false
+	}
+	if openaiErr.StatusCode == 408 {
+		// azure处理超时不重试
+		return false
+	}
+	if openaiErr.StatusCode/100 == 2 {
+		return false
+	}
+	return true
 }

 func processChannelError(c *gin.Context, channelError types.ChannelError, err *types.NewAPIError) {
@@ -339,7 +348,7 @@ func processChannelError(c *gin.Context, channelError types.ChannelError, err *t
 	// 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 {
 		gopool.Go(func() {
-			service.DisableChannel(channelError, err.ErrorWithStatusCode())
+			service.DisableChannel(channelError, err.Error())
 		})
 	}

@@ -368,9 +377,8 @@ func processChannelError(c *gin.Context, channelError types.ChannelError, err *t
 			adminInfo["is_multi_key"] = true
 			adminInfo["multi_key_index"] = common.GetContextKeyInt(c, constant.ContextKeyChannelMultiKeyIndex)
 		}
-		service.AppendChannelAffinityAdminInfo(c, adminInfo)
 		other["admin_info"] = adminInfo
-		model.RecordErrorLog(c, userId, channelId, modelName, tokenName, err.MaskSensitiveErrorWithStatusCode(), tokenId, 0, false, userGroup, other)
+		model.RecordErrorLog(c, userId, channelId, modelName, tokenName, err.MaskSensitiveError(), tokenId, 0, false, userGroup, other)
 	}

 }
--- a/controller/task_video.go
+++ b/controller/task_video.go
@@ -74,13 +74,7 @@ func updateVideoSingleTask(ctx context.Context, adaptor channel.TaskAdaptor, cha
 		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)
--- a/controller/token.go
+++ b/controller/token.go
@@ -1,7 +1,6 @@
 package controller

 import (
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -150,24 +149,6 @@ func AddToken(c *gin.Context) {
 		})
 		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{
@@ -235,23 +216,6 @@ func UpdateToken(c *gin.Context) {
 		})
 		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)
@@ -297,6 +261,7 @@ func UpdateToken(c *gin.Context) {
 		"message": "",
 		"data":    cleanToken,
 	})
+	return
 }

 type TokenBatch struct {
--- 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/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/openapi/relay.json
+++ b/docs/openapi/relay.json
@@ -284,46 +284,6 @@
          }
        ]
      }
-    },
-	    "/v1/responses/compact": {
-	      "post": {
-	        "summary": "压缩对话 (OpenAI Responses API)",
-	        "deprecated": false,
-	        "description": "OpenAI Responses API，用于对长对话进行 compaction。",
-	        "operationId": "compactResponse",
-        "tags": [
-          "OpenAI格式(Responses)"
-        ],
-        "parameters": [],
-	        "requestBody": {
-	          "content": {
-	            "application/json": {
-	              "schema": {
-	                "$ref": "#/components/schemas/ResponsesCompactionRequest"
-	              }
-	            }
-	          },
-	          "required": true
-	        },
-        "responses": {
-          "200": {
-            "description": "成功压缩对话",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ResponsesCompactionResponse"
-                }
-              }
-            },
-            "headers": {}
-          }
-        },
-        "security": [
-          {
-            "BearerAuth": []
-          }
-        ]
-      }
    },
    "/v1/images/generations": {
      "post": {
@@ -3170,71 +3130,10 @@
          }
        }
      },
-	      "ResponsesCompactionResponse": {
-	        "type": "object",
-	        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "object": {
-            "type": "string",
-            "example": "response.compaction"
-          },
-          "created_at": {
-            "type": "integer"
-          },
-          "output": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {}
-            }
-          },
-          "usage": {
-            "$ref": "#/components/schemas/Usage"
-          },
-          "error": {
-            "type": "object",
-            "properties": {}
-          }
-	        }
-	      },
-	      "ResponsesCompactionRequest": {
-	        "type": "object",
-	        "required": [
-	          "model"
-	        ],
-	        "properties": {
-	          "model": {
-	            "type": "string"
-	          },
-	          "input": {
-	            "description": "输入内容，可以是字符串或消息数组",
-	            "oneOf": [
-	              {
-	                "type": "string"
-	              },
-	              {
-	                "type": "array",
-	                "items": {
-	                  "type": "object",
-	                  "properties": {}
-	                }
-	              }
-	            ]
-	          },
-	          "instructions": {
-	            "type": "string"
-	          },
-	          "previous_response_id": {
-	            "type": "string"
-	          }
-	        }
-	      },
-	      "ResponsesStreamResponse": {
-	        "type": "object",
-	        "properties": {
-	          "type": {
+      "ResponsesStreamResponse": {
+        "type": "object",
+        "properties": {
+          "type": {
            "type": "string"
          },
          "response": {
@@ -7239,4 +7138,4 @@
      "BearerAuth": []
    }
  ]
-}
+}
--- a/dto/error.go
+++ b/dto/error.go
@@ -26,8 +26,6 @@ type GeneralErrorResponse struct {
 	Msg      string          `json:"msg"`
 	Err      string          `json:"err"`
 	ErrorMsg string          `json:"error_msg"`
-	Metadata json.RawMessage `json:"metadata,omitempty"`
-	Detail   string          `json:"detail,omitempty"`
 	Header   struct {
 		Message string `json:"message"`
 	} `json:"header"`
@@ -80,9 +78,6 @@ func (e GeneralErrorResponse) ToMessage() string {
 	if e.ErrorMsg != "" {
 		return e.ErrorMsg
 	}
-	if e.Detail != "" {
-		return e.Detail
-	}
 	if e.Header.Message != "" {
 		return e.Header.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())
@@ -240,7 +219,7 @@ type GeminiFunctionResponse struct {
 	Response     map[string]interface{} `json:"response"`
 	WillContinue json.RawMessage        `json:"willContinue,omitempty"`
 	Scheduling   json.RawMessage        `json:"scheduling,omitempty"`
-	Parts        json.RawMessage        `json:"parts,omitempty"`
+	Parts        []GeminiPart           `json:"parts,omitempty"`
 	ID           json.RawMessage        `json:"id,omitempty"`
 }

@@ -341,88 +320,6 @@ type GeminiChatGenerationConfig struct {
 	ImageConfig        json.RawMessage       `json:"imageConfig,omitempty"`  // RawMessage to allow flexible image config
 }

-// UnmarshalJSON allows GeminiChatGenerationConfig to accept both snake_case and camelCase fields.
-func (c *GeminiChatGenerationConfig) UnmarshalJSON(data []byte) error {
-	type Alias GeminiChatGenerationConfig
-	var aux struct {
-		Alias
-		TopPSnake               float64               `json:"top_p,omitempty"`
-		TopKSnake               float64               `json:"top_k,omitempty"`
-		MaxOutputTokensSnake    uint                  `json:"max_output_tokens,omitempty"`
-		CandidateCountSnake     int                   `json:"candidate_count,omitempty"`
-		StopSequencesSnake      []string              `json:"stop_sequences,omitempty"`
-		ResponseMimeTypeSnake   string                `json:"response_mime_type,omitempty"`
-		ResponseSchemaSnake     any                   `json:"response_schema,omitempty"`
-		ResponseJsonSchemaSnake json.RawMessage       `json:"response_json_schema,omitempty"`
-		PresencePenaltySnake    *float32              `json:"presence_penalty,omitempty"`
-		FrequencyPenaltySnake   *float32              `json:"frequency_penalty,omitempty"`
-		ResponseLogprobsSnake   bool                  `json:"response_logprobs,omitempty"`
-		MediaResolutionSnake    MediaResolution       `json:"media_resolution,omitempty"`
-		ResponseModalitiesSnake []string              `json:"response_modalities,omitempty"`
-		ThinkingConfigSnake     *GeminiThinkingConfig `json:"thinking_config,omitempty"`
-		SpeechConfigSnake       json.RawMessage       `json:"speech_config,omitempty"`
-		ImageConfigSnake        json.RawMessage       `json:"image_config,omitempty"`
-	}
-
-	if err := common.Unmarshal(data, &aux); err != nil {
-		return err
-	}
-
-	*c = GeminiChatGenerationConfig(aux.Alias)
-
-	// Prioritize snake_case if present
-	if aux.TopPSnake != 0 {
-		c.TopP = aux.TopPSnake
-	}
-	if aux.TopKSnake != 0 {
-		c.TopK = aux.TopKSnake
-	}
-	if aux.MaxOutputTokensSnake != 0 {
-		c.MaxOutputTokens = aux.MaxOutputTokensSnake
-	}
-	if aux.CandidateCountSnake != 0 {
-		c.CandidateCount = aux.CandidateCountSnake
-	}
-	if len(aux.StopSequencesSnake) > 0 {
-		c.StopSequences = aux.StopSequencesSnake
-	}
-	if aux.ResponseMimeTypeSnake != "" {
-		c.ResponseMimeType = aux.ResponseMimeTypeSnake
-	}
-	if aux.ResponseSchemaSnake != nil {
-		c.ResponseSchema = aux.ResponseSchemaSnake
-	}
-	if len(aux.ResponseJsonSchemaSnake) > 0 {
-		c.ResponseJsonSchema = aux.ResponseJsonSchemaSnake
-	}
-	if aux.PresencePenaltySnake != nil {
-		c.PresencePenalty = aux.PresencePenaltySnake
-	}
-	if aux.FrequencyPenaltySnake != nil {
-		c.FrequencyPenalty = aux.FrequencyPenaltySnake
-	}
-	if aux.ResponseLogprobsSnake {
-		c.ResponseLogprobs = aux.ResponseLogprobsSnake
-	}
-	if aux.MediaResolutionSnake != "" {
-		c.MediaResolution = aux.MediaResolutionSnake
-	}
-	if len(aux.ResponseModalitiesSnake) > 0 {
-		c.ResponseModalities = aux.ResponseModalitiesSnake
-	}
-	if aux.ThinkingConfigSnake != nil {
-		c.ThinkingConfig = aux.ThinkingConfigSnake
-	}
-	if len(aux.SpeechConfigSnake) > 0 {
-		c.SpeechConfig = aux.SpeechConfigSnake
-	}
-	if len(aux.ImageConfigSnake) > 0 {
-		c.ImageConfig = aux.ImageConfigSnake
-	}
-
-	return nil
-}
-
 type MediaResolution string

 type GeminiChatCandidate struct {
--- a/dto/openai_compaction.go
+++ b/dto/openai_compaction.go
@@ -1,20 +0,0 @@
-package dto
-
-import (
-	"encoding/json"
-
-	"github.com/QuantumNous/new-api/types"
-)
-
-type OpenAIResponsesCompactionResponse struct {
-	ID        string          `json:"id"`
-	Object    string          `json:"object"`
-	CreatedAt int             `json:"created_at"`
-	Output    json.RawMessage `json:"output"`
-	Usage     *Usage          `json:"usage"`
-	Error     any             `json:"error,omitempty"`
-}
-
-func (o *OpenAIResponsesCompactionResponse) GetOpenAIError() *types.OpenAIError {
-	return GetOpenAIError(o.Error)
-}
--- a/dto/openai_image.go
+++ b/dto/openai_image.go
@@ -167,9 +167,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,8 @@ 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"`
+	EnableThinking         any             `json:"enable_thinking,omitempty"`
 	ChatTemplateKwargs     json.RawMessage `json:"chat_template_kwargs,omitempty"`
-	EnableSearch           json.RawMessage `json:"enable_search,omitempty"`
 	// ollama Params
 	Think json.RawMessage `json:"think,omitempty"`
 	// baidu v2
@@ -808,11 +805,11 @@ type OpenAIResponsesRequest struct {
 	PromptCacheKey       json.RawMessage `json:"prompt_cache_key,omitempty"`
 	PromptCacheRetention json.RawMessage `json:"prompt_cache_retention,omitempty"`
 	Stream               bool            `json:"stream,omitempty"`
-	Temperature          *float64        `json:"temperature,omitempty"`
+	Temperature          float64         `json:"temperature,omitempty"`
 	Text                 json.RawMessage `json:"text,omitempty"`
 	ToolChoice           json.RawMessage `json:"tool_choice,omitempty"`
 	Tools                json.RawMessage `json:"tools,omitempty"` // 需要处理的参数很少，MCP 参数太多不确定，所以用 map
-	TopP                 *float64        `json:"top_p,omitempty"`
+	TopP                 float64         `json:"top_p,omitempty"`
 	Truncation           string          `json:"truncation,omitempty"`
 	User                 string          `json:"user,omitempty"`
 	MaxToolCalls         uint            `json:"max_tool_calls,omitempty"`
--- a/dto/openai_response.go
+++ b/dto/openai_response.go
@@ -334,16 +334,13 @@ type IncompleteDetails struct {
 }

 type ResponsesOutput struct {
-	Type      string                   `json:"type"`
-	ID        string                   `json:"id"`
-	Status    string                   `json:"status"`
-	Role      string                   `json:"role"`
-	Content   []ResponsesOutputContent `json:"content"`
-	Quality   string                   `json:"quality"`
-	Size      string                   `json:"size"`
-	CallId    string                   `json:"call_id,omitempty"`
-	Name      string                   `json:"name,omitempty"`
-	Arguments string                   `json:"arguments,omitempty"`
+	Type    string                   `json:"type"`
+	ID      string                   `json:"id"`
+	Status  string                   `json:"status"`
+	Role    string                   `json:"role"`
+	Content []ResponsesOutputContent `json:"content"`
+	Quality string                   `json:"quality"`
+	Size    string                   `json:"size"`
 }

 type ResponsesOutputContent struct {
@@ -372,10 +369,6 @@ type ResponsesStreamResponse struct {
 	Response *OpenAIResponsesResponse `json:"response,omitempty"`
 	Delta    string                   `json:"delta,omitempty"`
 	Item     *ResponsesOutput         `json:"item,omitempty"`
-	// - response.function_call_arguments.delta
-	// - response.function_call_arguments.done
-	OutputIndex *int   `json:"output_index,omitempty"`
-	ItemID      string `json:"item_id,omitempty"`
 }

 // GetOpenAIError 从动态错误类型中提取OpenAIError结构
--- a/dto/openai_responses_compaction_request.go
+++ b/dto/openai_responses_compaction_request.go
@@ -1,40 +0,0 @@
-package dto
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/QuantumNous/new-api/types"
-
-	"github.com/gin-gonic/gin"
-)
-
-type OpenAIResponsesCompactionRequest struct {
-	Model              string          `json:"model"`
-	Input              json.RawMessage `json:"input,omitempty"`
-	Instructions       json.RawMessage `json:"instructions,omitempty"`
-	PreviousResponseID string          `json:"previous_response_id,omitempty"`
-}
-
-func (r *OpenAIResponsesCompactionRequest) GetTokenCountMeta() *types.TokenCountMeta {
-	var parts []string
-	if len(r.Instructions) > 0 {
-		parts = append(parts, string(r.Instructions))
-	}
-	if len(r.Input) > 0 {
-		parts = append(parts, string(r.Input))
-	}
-	return &types.TokenCountMeta{
-		CombineText: strings.Join(parts, "\n"),
-	}
-}
-
-func (r *OpenAIResponsesCompactionRequest) IsStream(c *gin.Context) bool {
-	return false
-}
-
-func (r *OpenAIResponsesCompactionRequest) SetModelName(modelName string) {
-	if modelName != "" {
-		r.Model = modelName
-	}
-}
--- a/dto/values.go
+++ b/dto/values.go
@@ -1,55 +0,0 @@
-package dto
-
-import (
-	"encoding/json"
-	"strconv"
-)
-
-type IntValue int
-
-func (i *IntValue) UnmarshalJSON(b []byte) error {
-	var n int
-	if err := json.Unmarshal(b, &n); err == nil {
-		*i = IntValue(n)
-		return nil
-	}
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	v, err := strconv.Atoi(s)
-	if err != nil {
-		return err
-	}
-	*i = IntValue(v)
-	return nil
-}
-
-func (i IntValue) MarshalJSON() ([]byte, error) {
-	return json.Marshal(int(i))
-}
-
-type BoolValue bool
-
-func (b *BoolValue) UnmarshalJSON(data []byte) error {
-	var boolean bool
-	if err := json.Unmarshal(data, &boolean); err == nil {
-		*b = BoolValue(boolean)
-		return nil
-	}
-	var str string
-	if err := json.Unmarshal(data, &str); err != nil {
-		return err
-	}
-	if str == "true" {
-		*b = BoolValue(true)
-	} else if str == "false" {
-		*b = BoolValue(false)
-	} else {
-		return json.Unmarshal(data, &boolean)
-	}
-	return nil
-}
-func (b BoolValue) MarshalJSON() ([]byte, error) {
-	return json.Marshal(bool(b))
-}
--- a/go.mod
+++ b/go.mod
@@ -27,7 +27,6 @@ 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
@@ -37,7 +36,6 @@ require (
 	github.com/samber/lo v1.52.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
@@ -55,18 +53,15 @@ require (
 )

 require (
-	github.com/DmitriyVTitov/size v1.5.0 // indirect
 	github.com/anknown/darts v0.0.0-20151216065714-83ff685239e6 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.2 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.2 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.1.0 // indirect
 	github.com/bytedance/sonic v1.14.1 // indirect
 	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.2-0.20180830191138-d8f796af33cc // 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
@@ -82,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
@@ -96,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.18.0 // 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
@@ -105,18 +99,9 @@ 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // 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.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.22.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/samber/go-singleflightx v0.3.2 // indirect
-	github.com/samber/hot v0.11.0 // 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
@@ -129,7 +114,7 @@ require (
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/protobuf v1.36.5 // 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
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,5 @@
 github.com/Calcium-Ion/go-epay v0.0.4 h1:C96M7WfRLadcIVscWzwLiYs8etI1wrDmtFMuK2zP22A=
 github.com/Calcium-Ion/go-epay v0.0.4/go.mod h1:cxo/ZOg8ClvE3VAnCmEzbuyAZINSq7kFEN9oHj5WQ2U=
-github.com/DmitriyVTitov/size v1.5.0 h1:/PzqxYrOyOUX1BXj6J9OuVRVGe+66VL4D9FlUaW515g=
-github.com/DmitriyVTitov/size v1.5.0/go.mod h1:le6rNI4CoLQV1b9gzp1+3d7hMAD/uu2QcJ+aYbNgiU0=
 github.com/abema/go-mp4 v1.4.1 h1:YoS4VRqd+pAmddRPLFf8vMk74kuGl6ULSjzhsIqwr6M=
 github.com/abema/go-mp4 v1.4.1/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
@@ -24,8 +22,6 @@ github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.33.0 h1:JzidOz4Hcn2RbP5fv
 github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.33.0/go.mod h1:9A4/PJYlWjvjEzzoOLGQjkLt4bYK9fRWi7uz1GSsAcA=
 github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
 github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/boombuler/barcode v1.1.0 h1:ChaYjBR63fr4LFyGn8E8nt7dBSt3MiU3zMOZqFvVkHo=
 github.com/boombuler/barcode v1.1.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
@@ -44,8 +40,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
@@ -116,7 +110,6 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -125,8 +118,9 @@ 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-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 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/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=
@@ -138,10 +132,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=
@@ -170,17 +160,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/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 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=
@@ -209,8 +194,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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 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=
@@ -229,27 +212,16 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/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/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+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/go-singleflightx v0.3.2 h1:jXbUU0fvis8Fdv4HGONboX5WdEZcYLoBEcKiE+ITCyQ=
-github.com/samber/go-singleflightx v0.3.2/go.mod h1:X2BR+oheHIYc73PvxRMlcASg6KYYTQyUYpdVU7t/ux4=
-github.com/samber/hot v0.11.0 h1:JhV9hk8SmZIqB0To8OyCzPubvszkuoSXWx/7FCEGO+Q=
-github.com/samber/hot v0.11.0/go.mod h1:NB9v5U4NfDx7jmlrP+zHuqCuLUsywgAtCH7XOAkOxAg=
+github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
+github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
 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/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
@@ -259,7 +231,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=
@@ -317,12 +288,12 @@ 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-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
+golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 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/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=
@@ -350,15 +321,11 @@ 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=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -383,29 +350,19 @@ 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.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
+modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
 modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
 modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 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.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 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.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
+modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 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=
--- a/main.go
+++ b/main.go
@@ -102,9 +102,6 @@ func main() {

 	go controller.AutomaticallyTestChannels()

-	// Codex credential auto-refresh check every 10 minutes, refresh when expires within 1 day
-	service.StartCodexCredentialAutoRefreshTask()
-
 	if common.IsMasterNode && constant.UpdateTask {
 		gopool.Go(func() {
 			controller.UpdateMidjourneyTaskBulk()
@@ -127,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) {
@@ -191,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))
 }
@@ -213,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
@@ -13,7 +13,6 @@ import (
 	"github.com/QuantumNous/new-api/model"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/ratio_setting"
-	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -196,8 +195,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)
@@ -219,14 +218,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]
@@ -257,7 +252,7 @@ func TokenAuth() func(c *gin.Context) {
 				return
 			}
 			if common.IsIpInCIDRList(ip, allowIps) == false {
-				abortWithOpenAiMessage(c, http.StatusForbidden, "您的 IP 不在令牌允许访问的列表中", types.ErrorCodeAccessDenied)
+				abortWithOpenAiMessage(c, http.StatusForbidden, "您的 IP 不在令牌允许访问的列表中")
 				return
 			}
 			logger.LogDebug(c, "Client IP %s passed the token IP restrictions check", clientIp)
--- a/middleware/distributor.go
+++ b/middleware/distributor.go
@@ -97,64 +97,35 @@ func Distribute() func(c *gin.Context) {
 						common.SetContextKey(c, constant.ContextKeyUsingGroup, usingGroup)
 					}
 				}
-
-				if preferredChannelID, found := service.GetPreferredChannelByAffinity(c, modelRequest.Model, usingGroup); found {
-					preferred, err := model.CacheGetChannel(preferredChannelID)
-					if err == nil && preferred != nil && preferred.Status == common.ChannelStatusEnabled {
-						if usingGroup == "auto" {
-							userGroup := common.GetContextKeyString(c, constant.ContextKeyUserGroup)
-							autoGroups := service.GetUserAutoGroup(userGroup)
-							for _, g := range autoGroups {
-								if model.IsChannelEnabledForGroupModel(g, modelRequest.Model, preferred.Id) {
-									selectGroup = g
-									common.SetContextKey(c, constant.ContextKeyAutoGroup, g)
-									channel = preferred
-									service.MarkChannelAffinityUsed(c, g, preferred.Id)
-									break
-								}
-							}
-						} else if model.IsChannelEnabledForGroupModel(usingGroup, modelRequest.Model, preferred.Id) {
-							channel = preferred
-							selectGroup = usingGroup
-							service.MarkChannelAffinityUsed(c, usingGroup, preferred.Id)
-						}
+				channel, selectGroup, err = service.CacheGetRandomSatisfiedChannel(&service.RetryParam{
+					Ctx:        c,
+					ModelName:  modelRequest.Model,
+					TokenGroup: usingGroup,
+					Retry:      common.GetPointer(0),
+				})
+				if err != nil {
+					showGroup := usingGroup
+					if usingGroup == "auto" {
+						showGroup = fmt.Sprintf("auto(%s)", selectGroup)
 					}
+					message := fmt.Sprintf("获取分组 %s 下模型 %s 的可用渠道失败（distributor）: %s", showGroup, modelRequest.Model, err.Error())
+					// 如果错误，但是渠道不为空，说明是数据库一致性问题
+					//if channel != nil {
+					//	common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
+					//	message = "数据库一致性已被破坏，请联系管理员"
+					//}
+					abortWithOpenAiMessage(c, http.StatusServiceUnavailable, message, string(types.ErrorCodeModelNotFound))
+					return
 				}
-
 				if channel == nil {
-					channel, selectGroup, err = service.CacheGetRandomSatisfiedChannel(&service.RetryParam{
-						Ctx:        c,
-						ModelName:  modelRequest.Model,
-						TokenGroup: usingGroup,
-						Retry:      common.GetPointer(0),
-					})
-					if err != nil {
-						showGroup := usingGroup
-						if usingGroup == "auto" {
-							showGroup = fmt.Sprintf("auto(%s)", selectGroup)
-						}
-						message := fmt.Sprintf("获取分组 %s 下模型 %s 的可用渠道失败（distributor）: %s", showGroup, modelRequest.Model, err.Error())
-						// 如果错误，但是渠道不为空，说明是数据库一致性问题
-						//if channel != nil {
-						//	common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
-						//	message = "数据库一致性已被破坏，请联系管理员"
-						//}
-						abortWithOpenAiMessage(c, http.StatusServiceUnavailable, message, types.ErrorCodeModelNotFound)
-						return
-					}
-					if channel == nil {
-						abortWithOpenAiMessage(c, http.StatusServiceUnavailable, fmt.Sprintf("分组 %s 下模型 %s 无可用渠道（distributor）", usingGroup, modelRequest.Model), types.ErrorCodeModelNotFound)
-						return
-					}
+					abortWithOpenAiMessage(c, http.StatusServiceUnavailable, fmt.Sprintf("分组 %s 下模型 %s 无可用渠道（distributor）", usingGroup, modelRequest.Model), string(types.ErrorCodeModelNotFound))
+					return
 				}
 			}
 		}
 		common.SetContextKey(c, constant.ContextKeyRequestStartTime, time.Now())
 		SetupContextForSelectedChannel(c, channel, modelRequest.Model)
 		c.Next()
-		if channel != nil && c.Writer != nil && c.Writer.Status() < http.StatusBadRequest {
-			service.RecordChannelAffinity(c, channel.Id)
-		}
 	}
 }

@@ -329,10 +300,6 @@ func getModelRequest(c *gin.Context) (*ModelRequest, bool, error) {
 		modelRequest.Group = req.Group
 		common.SetContextKey(c, constant.ContextKeyTokenGroup, modelRequest.Group)
 	}
-
-	if strings.HasPrefix(c.Request.URL.Path, "/v1/responses/compact") && modelRequest.Model != "" {
-		modelRequest.Model = ratio_setting.WithCompactModelSuffix(modelRequest.Model)
-	}
 	return &modelRequest, shouldSelectChannel, nil
 }

--- a/middleware/utils.go
+++ b/middleware/utils.go
@@ -5,14 +5,13 @@ import (

 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/logger"
-	"github.com/QuantumNous/new-api/types"
 	"github.com/gin-gonic/gin"
 )

-func abortWithOpenAiMessage(c *gin.Context, statusCode int, message string, code ...types.ErrorCode) {
+func abortWithOpenAiMessage(c *gin.Context, statusCode int, message string, code ...string) {
 	codeStr := ""
 	if len(code) > 0 {
-		codeStr = string(code[0])
+		codeStr = code[0]
 	}
 	userId := c.GetInt("id")
 	c.JSON(statusCode, gin.H{
--- a/model/channel_satisfy.go
+++ b/model/channel_satisfy.go
@@ -1,71 +0,0 @@
-package model
-
-import (
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/setting/ratio_setting"
-)
-
-func IsChannelEnabledForGroupModel(group string, modelName string, channelID int) bool {
-	if group == "" || modelName == "" || channelID <= 0 {
-		return false
-	}
-	if !common.MemoryCacheEnabled {
-		return isChannelEnabledForGroupModelDB(group, modelName, channelID)
-	}
-
-	channelSyncLock.RLock()
-	defer channelSyncLock.RUnlock()
-
-	if group2model2channels == nil {
-		return false
-	}
-
-	if isChannelIDInList(group2model2channels[group][modelName], channelID) {
-		return true
-	}
-	normalized := ratio_setting.FormatMatchingModelName(modelName)
-	if normalized != "" && normalized != modelName {
-		return isChannelIDInList(group2model2channels[group][normalized], channelID)
-	}
-	return false
-}
-
-func IsChannelEnabledForAnyGroupModel(groups []string, modelName string, channelID int) bool {
-	if len(groups) == 0 {
-		return false
-	}
-	for _, g := range groups {
-		if IsChannelEnabledForGroupModel(g, modelName, channelID) {
-			return true
-		}
-	}
-	return false
-}
-
-func isChannelEnabledForGroupModelDB(group string, modelName string, channelID int) bool {
-	var count int64
-	err := DB.Model(&Ability{}).
-		Where(commonGroupCol+" = ? and model = ? and channel_id = ? and enabled = ?", group, modelName, channelID, true).
-		Count(&count).Error
-	if err == nil && count > 0 {
-		return true
-	}
-	normalized := ratio_setting.FormatMatchingModelName(modelName)
-	if normalized == "" || normalized == modelName {
-		return false
-	}
-	count = 0
-	err = DB.Model(&Ability{}).
-		Where(commonGroupCol+" = ? and model = ? and channel_id = ? and enabled = ?", group, normalized, channelID, true).
-		Count(&count).Error
-	return err == nil && count > 0
-}
-
-func isChannelIDInList(list []int, channelID int) bool {
-	for _, id := range list {
-		if id == channelID {
-			return true
-		}
-	}
-	return false
-}
--- 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/log.go
+++ b/model/log.go
@@ -56,10 +56,8 @@ func formatUserLogs(logs []*Log) {
 		var otherMap map[string]interface{}
 		otherMap, _ = common.StrToMap(logs[i].Other)
 		if otherMap != nil {
-			// Remove admin-only debug fields.
+			// delete admin
 			delete(otherMap, "admin_info")
-			delete(otherMap, "request_conversion")
-			delete(otherMap, "reject_reason")
 		}
 		logs[i].Other = common.MapToJsonStr(otherMap)
 		logs[i].Id = logs[i].Id % 1024
--- 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/option.go
+++ b/model/option.go
@@ -143,8 +143,6 @@ func InitOptionMap() {
 	common.OptionMap["SensitiveWords"] = setting.SensitiveWordsToString()
 	common.OptionMap["StreamCacheQueueLength"] = strconv.Itoa(setting.StreamCacheQueueLength)
 	common.OptionMap["AutomaticDisableKeywords"] = operation_setting.AutomaticDisableKeywordsToString()
-	common.OptionMap["AutomaticDisableStatusCodes"] = operation_setting.AutomaticDisableStatusCodesToString()
-	common.OptionMap["AutomaticRetryStatusCodes"] = operation_setting.AutomaticRetryStatusCodesToString()
 	common.OptionMap["ExposeRatioEnabled"] = strconv.FormatBool(ratio_setting.IsExposeRatioEnabled())

 	// 自动添加所有注册的模型配置
@@ -446,10 +444,6 @@ func updateOptionMap(key string, value string) (err error) {
 		setting.SensitiveWordsFromString(value)
 	case "AutomaticDisableKeywords":
 		operation_setting.AutomaticDisableKeywordsFromString(value)
-	case "AutomaticDisableStatusCodes":
-		err = operation_setting.AutomaticDisableStatusCodesFromString(value)
-	case "AutomaticRetryStatusCodes":
-		err = operation_setting.AutomaticRetryStatusCodesFromString(value)
 	case "StreamCacheQueueLength":
 		setting.StreamCacheQueueLength, _ = strconv.Atoi(value)
 	case "PayMethods":
--- a/model/token.go
+++ b/model/token.go
@@ -26,7 +26,7 @@ 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分组有效
+	CrossGroupRetry    bool           `json:"cross_group_retry" gorm:"default:false"` // 跨分组重试，仅auto分组有效
 	DeletedAt          gorm.DeletedAt `gorm:"index"`
 }

@@ -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) {
--- a/pkg/cachex/codec.go
+++ b/pkg/cachex/codec.go
@@ -1,53 +0,0 @@
-package cachex
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-type ValueCodec[V any] interface {
-	Encode(v V) (string, error)
-	Decode(s string) (V, error)
-}
-
-type IntCodec struct{}
-
-func (c IntCodec) Encode(v int) (string, error) {
-	return strconv.Itoa(v), nil
-}
-
-func (c IntCodec) Decode(s string) (int, error) {
-	s = strings.TrimSpace(s)
-	if s == "" {
-		return 0, fmt.Errorf("empty int value")
-	}
-	return strconv.Atoi(s)
-}
-
-type StringCodec struct{}
-
-func (c StringCodec) Encode(v string) (string, error) { return v, nil }
-func (c StringCodec) Decode(s string) (string, error) { return s, nil }
-
-type JSONCodec[V any] struct{}
-
-func (c JSONCodec[V]) Encode(v V) (string, error) {
-	b, err := json.Marshal(v)
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}
-
-func (c JSONCodec[V]) Decode(s string) (V, error) {
-	var v V
-	if strings.TrimSpace(s) == "" {
-		return v, fmt.Errorf("empty json value")
-	}
-	if err := json.Unmarshal([]byte(s), &v); err != nil {
-		return v, err
-	}
-	return v, nil
-}
--- a/pkg/cachex/hybrid_cache.go
+++ b/pkg/cachex/hybrid_cache.go
@@ -1,285 +0,0 @@
-package cachex
-
-import (
-	"context"
-	"errors"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/go-redis/redis/v8"
-	"github.com/samber/hot"
-)
-
-const (
-	defaultRedisOpTimeout   = 2 * time.Second
-	defaultRedisScanTimeout = 30 * time.Second
-	defaultRedisDelTimeout  = 10 * time.Second
-)
-
-type HybridCacheConfig[V any] struct {
-	Namespace Namespace
-
-	// Redis is used when RedisEnabled returns true (or RedisEnabled is nil) and Redis is not nil.
-	Redis        *redis.Client
-	RedisCodec   ValueCodec[V]
-	RedisEnabled func() bool
-
-	// Memory builds a hot cache used when Redis is disabled. Keys stored in memory are fully namespaced.
-	Memory func() *hot.HotCache[string, V]
-}
-
-// HybridCache is a small helper that uses Redis when enabled, otherwise falls back to in-memory hot cache.
-type HybridCache[V any] struct {
-	ns Namespace
-
-	redis        *redis.Client
-	redisCodec   ValueCodec[V]
-	redisEnabled func() bool
-
-	memOnce sync.Once
-	memInit func() *hot.HotCache[string, V]
-	mem     *hot.HotCache[string, V]
-}
-
-func NewHybridCache[V any](cfg HybridCacheConfig[V]) *HybridCache[V] {
-	return &HybridCache[V]{
-		ns:           cfg.Namespace,
-		redis:        cfg.Redis,
-		redisCodec:   cfg.RedisCodec,
-		redisEnabled: cfg.RedisEnabled,
-		memInit:      cfg.Memory,
-	}
-}
-
-func (c *HybridCache[V]) FullKey(key string) string {
-	return c.ns.FullKey(key)
-}
-
-func (c *HybridCache[V]) redisOn() bool {
-	if c.redis == nil || c.redisCodec == nil {
-		return false
-	}
-	if c.redisEnabled == nil {
-		return true
-	}
-	return c.redisEnabled()
-}
-
-func (c *HybridCache[V]) memCache() *hot.HotCache[string, V] {
-	c.memOnce.Do(func() {
-		if c.memInit == nil {
-			c.mem = hot.NewHotCache[string, V](hot.LRU, 1).Build()
-			return
-		}
-		c.mem = c.memInit()
-	})
-	return c.mem
-}
-
-func (c *HybridCache[V]) Get(key string) (value V, found bool, err error) {
-	full := c.ns.FullKey(key)
-	if full == "" {
-		var zero V
-		return zero, false, nil
-	}
-
-	if c.redisOn() {
-		ctx, cancel := context.WithTimeout(context.Background(), defaultRedisOpTimeout)
-		defer cancel()
-
-		raw, e := c.redis.Get(ctx, full).Result()
-		if e == nil {
-			v, decErr := c.redisCodec.Decode(raw)
-			if decErr != nil {
-				var zero V
-				return zero, false, decErr
-			}
-			return v, true, nil
-		}
-		if errors.Is(e, redis.Nil) {
-			var zero V
-			return zero, false, nil
-		}
-		var zero V
-		return zero, false, e
-	}
-
-	return c.memCache().Get(full)
-}
-
-func (c *HybridCache[V]) SetWithTTL(key string, v V, ttl time.Duration) error {
-	full := c.ns.FullKey(key)
-	if full == "" {
-		return nil
-	}
-
-	if c.redisOn() {
-		raw, err := c.redisCodec.Encode(v)
-		if err != nil {
-			return err
-		}
-		ctx, cancel := context.WithTimeout(context.Background(), defaultRedisOpTimeout)
-		defer cancel()
-		return c.redis.Set(ctx, full, raw, ttl).Err()
-	}
-
-	c.memCache().SetWithTTL(full, v, ttl)
-	return nil
-}
-
-// Keys returns keys with valid values. In Redis, it returns all matching keys.
-func (c *HybridCache[V]) Keys() ([]string, error) {
-	if c.redisOn() {
-		return c.scanKeys(c.ns.MatchPattern())
-	}
-	return c.memCache().Keys(), nil
-}
-
-func (c *HybridCache[V]) scanKeys(match string) ([]string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), defaultRedisScanTimeout)
-	defer cancel()
-
-	var cursor uint64
-	keys := make([]string, 0, 1024)
-	for {
-		k, next, err := c.redis.Scan(ctx, cursor, match, 1000).Result()
-		if err != nil {
-			return keys, err
-		}
-		keys = append(keys, k...)
-		cursor = next
-		if cursor == 0 {
-			break
-		}
-	}
-	return keys, nil
-}
-
-func (c *HybridCache[V]) Purge() error {
-	if c.redisOn() {
-		keys, err := c.scanKeys(c.ns.MatchPattern())
-		if err != nil {
-			return err
-		}
-		if len(keys) == 0 {
-			return nil
-		}
-		_, err = c.DeleteMany(keys)
-		return err
-	}
-
-	c.memCache().Purge()
-	return nil
-}
-
-func (c *HybridCache[V]) DeleteByPrefix(prefix string) (int, error) {
-	fullPrefix := c.ns.FullKey(prefix)
-	if fullPrefix == "" {
-		return 0, nil
-	}
-	if !strings.HasSuffix(fullPrefix, ":") {
-		fullPrefix += ":"
-	}
-
-	if c.redisOn() {
-		match := fullPrefix + "*"
-		keys, err := c.scanKeys(match)
-		if err != nil {
-			return 0, err
-		}
-		if len(keys) == 0 {
-			return 0, nil
-		}
-
-		res, err := c.DeleteMany(keys)
-		if err != nil {
-			return 0, err
-		}
-		deleted := 0
-		for _, ok := range res {
-			if ok {
-				deleted++
-			}
-		}
-		return deleted, nil
-	}
-
-	// In memory, we filter keys and bulk delete.
-	allKeys := c.memCache().Keys()
-	keys := make([]string, 0, 128)
-	for _, k := range allKeys {
-		if strings.HasPrefix(k, fullPrefix) {
-			keys = append(keys, k)
-		}
-	}
-	if len(keys) == 0 {
-		return 0, nil
-	}
-	res, _ := c.DeleteMany(keys)
-	deleted := 0
-	for _, ok := range res {
-		if ok {
-			deleted++
-		}
-	}
-	return deleted, nil
-}
-
-// DeleteMany accepts either fully namespaced keys or raw keys and deletes them.
-// It returns a map keyed by fully namespaced keys.
-func (c *HybridCache[V]) DeleteMany(keys []string) (map[string]bool, error) {
-	res := make(map[string]bool, len(keys))
-	if len(keys) == 0 {
-		return res, nil
-	}
-
-	fullKeys := make([]string, 0, len(keys))
-	for _, k := range keys {
-		k = c.ns.FullKey(k)
-		if k == "" {
-			continue
-		}
-		fullKeys = append(fullKeys, k)
-	}
-	if len(fullKeys) == 0 {
-		return res, nil
-	}
-
-	if c.redisOn() {
-		ctx, cancel := context.WithTimeout(context.Background(), defaultRedisDelTimeout)
-		defer cancel()
-
-		pipe := c.redis.Pipeline()
-		cmds := make([]*redis.IntCmd, 0, len(fullKeys))
-		for _, k := range fullKeys {
-			// UNLINK is non-blocking vs DEL for large key batches.
-			cmds = append(cmds, pipe.Unlink(ctx, k))
-		}
-		_, err := pipe.Exec(ctx)
-		if err != nil && !errors.Is(err, redis.Nil) {
-			return res, err
-		}
-		for i, cmd := range cmds {
-			deleted := cmd != nil && cmd.Err() == nil && cmd.Val() > 0
-			res[fullKeys[i]] = deleted
-		}
-		return res, nil
-	}
-
-	return c.memCache().DeleteMany(fullKeys), nil
-}
-
-func (c *HybridCache[V]) Capacity() (mainCacheCapacity int, missingCacheCapacity int) {
-	if c.redisOn() {
-		return 0, 0
-	}
-	return c.memCache().Capacity()
-}
-
-func (c *HybridCache[V]) Algorithm() (mainCacheAlgorithm string, missingCacheAlgorithm string) {
-	if c.redisOn() {
-		return "redis", ""
-	}
-	return c.memCache().Algorithm()
-}
--- a/pkg/cachex/namespace.go
+++ b/pkg/cachex/namespace.go
@@ -1,38 +0,0 @@
-package cachex
-
-import "strings"
-
-// Namespace isolates keys between different cache use-cases. (e.g. "channel_affinity:v1").
-type Namespace string
-
-func (n Namespace) prefix() string {
-	ns := strings.TrimSpace(string(n))
-	ns = strings.TrimRight(ns, ":")
-	if ns == "" {
-		return ""
-	}
-	return ns + ":"
-}
-
-func (n Namespace) FullKey(key string) string {
-	key = strings.TrimSpace(key)
-	if key == "" {
-		return ""
-	}
-	p := n.prefix()
-	if p == "" {
-		return strings.TrimLeft(key, ":")
-	}
-	if strings.HasPrefix(key, p) {
-		return key
-	}
-	return p + strings.TrimLeft(key, ":")
-}
-
-func (n Namespace) MatchPattern() string {
-	p := n.prefix()
-	if p == "" {
-		return "*"
-	}
-	return p + "*"
-}
--- 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
@@ -70,7 +70,7 @@ func AudioHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *type
 	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/ali/adaptor.go
+++ b/relay/channel/ali/adaptor.go
@@ -13,37 +13,12 @@ import (
 	"github.com/QuantumNous/new-api/relay/channel/openai"
 	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/service"
 	"github.com/QuantumNous/new-api/types"

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

 type Adaptor struct {
-	IsSyncImageModel bool
-}
-
-/*
-	var syncModels = []string{
-		"z-image",
-		"qwen-image",
-		"wan2.6",
-	}
-*/
-func supportsAliAnthropicMessages(modelName string) bool {
-	// Only models with the "qwen" designation can use the Claude-compatible interface; others require conversion.
-	return strings.Contains(strings.ToLower(modelName), "qwen")
-}
-
-var syncModels = []string{
-	"z-image",
-	"qwen-image",
-	"wan2.6",
-}
-
-func isSyncImageModel(modelName string) bool {
-	return model_setting.IsSyncImageModel(modelName)
 }

 func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dto.GeminiChatRequest) (any, error) {
@@ -52,18 +27,7 @@ func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dt
 }

 func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, req *dto.ClaudeRequest) (any, error) {
-	if supportsAliAnthropicMessages(info.UpstreamModelName) {
-		return req, nil
-	}
-
-	oaiReq, err := service.ClaudeToOpenAIRequest(*req, info)
-	if err != nil {
-		return nil, err
-	}
-	if info.SupportStreamOptions && info.IsStream {
-		oaiReq.StreamOptions = &dto.StreamOptions{IncludeUsage: true}
-	}
-	return a.ConvertOpenAIRequest(c, info, oaiReq)
+	return req, nil
 }

 func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
@@ -73,11 +37,7 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 	var fullRequestURL string
 	switch info.RelayFormat {
 	case types.RelayFormatClaude:
-		if supportsAliAnthropicMessages(info.UpstreamModelName) {
-			fullRequestURL = fmt.Sprintf("%s/apps/anthropic/v1/messages", info.ChannelBaseUrl)
-		} else {
-			fullRequestURL = fmt.Sprintf("%s/compatible-mode/v1/chat/completions", info.ChannelBaseUrl)
-		}
+		fullRequestURL = fmt.Sprintf("%s/api/v2/apps/claude-code-proxy/v1/messages", info.ChannelBaseUrl)
 	default:
 		switch info.RelayMode {
 		case constant.RelayModeEmbeddings:
@@ -85,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)
 			}
@@ -118,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) {
@@ -158,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") {
@@ -186,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
 		}
@@ -210,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")
 }

@@ -221,22 +161,21 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
 	switch info.RelayFormat {
 	case types.RelayFormatClaude:
-		if supportsAliAnthropicMessages(info.UpstreamModelName) {
-			if info.IsStream {
-				return claude.ClaudeStreamHandler(c, resp, info, claude.RequestModeMessage)
-			}
-
+		if info.IsStream {
+			return claude.ClaudeStreamHandler(c, resp, info, claude.RequestModeMessage)
+		} else {
 			return claude.ClaudeHandler(c, resp, info, claude.RequestModeMessage)
 		}
-
-		adaptor := openai.Adaptor{}
-		return adaptor.DoResponse(c, resp, info)
 	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/api_request.go
+++ b/relay/channel/api_request.go
@@ -38,46 +38,9 @@ func SetupApiRequestHeader(info *common.RelayInfo, c *gin.Context, req *http.Hea
 	}
 }

-const clientHeaderPlaceholderPrefix = "{client_header:"
-
-func applyHeaderOverridePlaceholders(template string, c *gin.Context, apiKey string) (string, bool, error) {
-	trimmed := strings.TrimSpace(template)
-	if strings.HasPrefix(trimmed, clientHeaderPlaceholderPrefix) {
-		afterPrefix := trimmed[len(clientHeaderPlaceholderPrefix):]
-		end := strings.Index(afterPrefix, "}")
-		if end < 0 || end != len(afterPrefix)-1 {
-			return "", false, fmt.Errorf("client_header placeholder must be the full value: %q", template)
-		}
-
-		name := strings.TrimSpace(afterPrefix[:end])
-		if name == "" {
-			return "", false, fmt.Errorf("client_header placeholder name is empty: %q", template)
-		}
-		if c == nil || c.Request == nil {
-			return "", false, fmt.Errorf("missing request context for client_header placeholder")
-		}
-		clientHeaderValue := c.Request.Header.Get(name)
-		if strings.TrimSpace(clientHeaderValue) == "" {
-			return "", false, nil
-		}
-		// Do not interpolate {api_key} inside client-supplied content.
-		return clientHeaderValue, true, nil
-	}
-
-	if strings.Contains(template, "{api_key}") {
-		template = strings.ReplaceAll(template, "{api_key}", apiKey)
-	}
-	if strings.TrimSpace(template) == "" {
-		return "", false, nil
-	}
-	return template, true, nil
-}
-
-// processHeaderOverride applies channel header overrides, with placeholder substitution.
-// Supported placeholders:
-//   - {api_key}: resolved to the channel API key
-//   - {client_header:<name>}: resolved to the incoming request header value
-func processHeaderOverride(info *common.RelayInfo, c *gin.Context) (map[string]string, error) {
+// processHeaderOverride 处理请求头覆盖，支持变量替换
+// 支持的变量：{api_key}
+func processHeaderOverride(info *common.RelayInfo) (map[string]string, error) {
 	headerOverride := make(map[string]string)
 	for k, v := range info.HeadersOverride {
 		str, ok := v.(string)
@@ -85,15 +48,12 @@ func processHeaderOverride(info *common.RelayInfo, c *gin.Context) (map[string]s
 			return nil, types.NewError(nil, types.ErrorCodeChannelHeaderOverrideInvalid)
 		}

-		value, include, err := applyHeaderOverridePlaceholders(str, c, info.ApiKey)
-		if err != nil {
-			return nil, types.NewError(err, types.ErrorCodeChannelHeaderOverrideInvalid)
-		}
-		if !include {
-			continue
+		// 替换支持的变量
+		if strings.Contains(str, "{api_key}") {
+			str = strings.ReplaceAll(str, "{api_key}", info.ApiKey)
 		}

-		headerOverride[k] = value
+		headerOverride[k] = str
 	}
 	return headerOverride, nil
 }
@@ -111,19 +71,17 @@ func DoApiRequest(a Adaptor, c *gin.Context, info *common.RelayInfo, requestBody
 		return nil, fmt.Errorf("new request failed: %w", err)
 	}
 	headers := req.Header
-	err = a.SetupRequestHeader(c, &headers, info)
-	if err != nil {
-		return nil, fmt.Errorf("setup request header failed: %w", err)
-	}
-	// 在 SetupRequestHeader 之后应用 Header Override，确保用户设置优先级最高
-	// 这样可以覆盖默认的 Authorization header 设置
-	headerOverride, err := processHeaderOverride(info, c)
+	headerOverride, err := processHeaderOverride(info)
 	if err != nil {
 		return nil, err
 	}
 	for key, value := range headerOverride {
 		headers.Set(key, value)
 	}
+	err = a.SetupRequestHeader(c, &headers, info)
+	if err != nil {
+		return nil, fmt.Errorf("setup request header failed: %w", err)
+	}
 	resp, err := doRequest(c, req, info)
 	if err != nil {
 		return nil, fmt.Errorf("do request failed: %w", err)
@@ -146,19 +104,17 @@ func DoFormRequest(a Adaptor, c *gin.Context, info *common.RelayInfo, requestBod
 	// set form data
 	req.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
 	headers := req.Header
-	err = a.SetupRequestHeader(c, &headers, info)
-	if err != nil {
-		return nil, fmt.Errorf("setup request header failed: %w", err)
-	}
-	// 在 SetupRequestHeader 之后应用 Header Override，确保用户设置优先级最高
-	// 这样可以覆盖默认的 Authorization header 设置
-	headerOverride, err := processHeaderOverride(info, c)
+	headerOverride, err := processHeaderOverride(info)
 	if err != nil {
 		return nil, err
 	}
 	for key, value := range headerOverride {
 		headers.Set(key, value)
 	}
+	err = a.SetupRequestHeader(c, &headers, info)
+	if err != nil {
+		return nil, fmt.Errorf("setup request header failed: %w", err)
+	}
 	resp, err := doRequest(c, req, info)
 	if err != nil {
 		return nil, fmt.Errorf("do request failed: %w", err)
@@ -172,19 +128,17 @@ func DoWssRequest(a Adaptor, c *gin.Context, info *common.RelayInfo, requestBody
 		return nil, fmt.Errorf("get request url failed: %w", err)
 	}
 	targetHeader := http.Header{}
-	err = a.SetupRequestHeader(c, &targetHeader, info)
-	if err != nil {
-		return nil, fmt.Errorf("setup request header failed: %w", err)
-	}
-	// 在 SetupRequestHeader 之后应用 Header Override，确保用户设置优先级最高
-	// 这样可以覆盖默认的 Authorization header 设置
-	headerOverride, err := processHeaderOverride(info, c)
+	headerOverride, err := processHeaderOverride(info)
 	if err != nil {
 		return nil, err
 	}
 	for key, value := range headerOverride {
 		targetHeader.Set(key, value)
 	}
+	err = a.SetupRequestHeader(c, &targetHeader, info)
+	if err != nil {
+		return nil, fmt.Errorf("setup request header failed: %w", err)
+	}
 	targetHeader.Set("Content-Type", c.Request.Header.Get("Content-Type"))
 	targetConn, _, err := websocket.DefaultDialer.Dial(fullRequestURL, targetHeader)
 	if err != nil {
--- 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"
@@ -39,13 +37,6 @@ func getAwsErrorStatusCode(err error) int {
 	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 +117,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)
@@ -211,10 +201,7 @@ 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
@@ -241,10 +228,7 @@ 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
@@ -284,10 +268,7 @@ 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
--- a/relay/channel/claude/relay-claude.go
+++ b/relay/channel/claude/relay-claude.go
@@ -8,13 +8,11 @@ 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"
 	"github.com/QuantumNous/new-api/relay/channel/openrouter"
 	relaycommon "github.com/QuantumNous/new-api/relay/common"
 	"github.com/QuantumNous/new-api/relay/helper"
-	"github.com/QuantumNous/new-api/relay/reasonmap"
 	"github.com/QuantumNous/new-api/service"
 	"github.com/QuantumNous/new-api/setting/model_setting"
 	"github.com/QuantumNous/new-api/types"
@@ -29,15 +27,17 @@ const (
 )

 func stopReasonClaude2OpenAI(reason string) string {
-	return reasonmap.ClaudeStopReasonToOpenAIFinishReason(reason)
-}
-
-func maybeMarkClaudeRefusal(c *gin.Context, stopReason string) {
-	if c == nil {
-		return
-	}
-	if strings.EqualFold(stopReason, "refusal") {
-		common.SetContextKey(c, constant.ContextKeyAdminRejectReason, "claude_stop_reason=refusal")
+	switch reason {
+	case "stop_sequence":
+		return "stop"
+	case "end_turn":
+		return "stop"
+	case "max_tokens":
+		return "length"
+	case "tool_use":
+		return "tool_calls"
+	default:
+		return reason
 	}
 }

@@ -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" {
@@ -644,12 +642,6 @@ func HandleStreamResponseData(c *gin.Context, info *relaycommon.RelayInfo, claud
 	if claudeError := claudeResponse.GetClaudeError(); claudeError != nil && claudeError.Type != "" {
 		return types.WithClaudeError(*claudeError, http.StatusInternalServerError)
 	}
-	if claudeResponse.StopReason != "" {
-		maybeMarkClaudeRefusal(c, claudeResponse.StopReason)
-	}
-	if claudeResponse.Delta != nil && claudeResponse.Delta.StopReason != nil {
-		maybeMarkClaudeRefusal(c, *claudeResponse.Delta.StopReason)
-	}
 	if info.RelayFormat == types.RelayFormatClaude {
 		FormatClaudeResponseInfo(requestMode, &claudeResponse, nil, claudeInfo)

@@ -741,7 +733,6 @@ func HandleClaudeResponseData(c *gin.Context, info *relaycommon.RelayInfo, claud
 	if claudeError := claudeResponse.GetClaudeError(); claudeError != nil && claudeError.Type != "" {
 		return types.WithClaudeError(*claudeError, http.StatusInternalServerError)
 	}
-	maybeMarkClaudeRefusal(c, claudeResponse.StopReason)
 	if requestMode == RequestModeCompletion {
 		claudeInfo.Usage = service.ResponseText2Usage(c, claudeResponse.Completion, info.UpstreamModelName, info.GetEstimatePromptTokens())
 	} else {
--- a/relay/channel/codex/adaptor.go
+++ b/relay/channel/codex/adaptor.go
@@ -1,176 +0,0 @@
-package codex
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/relay/channel"
-	"github.com/QuantumNous/new-api/relay/channel/openai"
-	relaycommon "github.com/QuantumNous/new-api/relay/common"
-	relayconstant "github.com/QuantumNous/new-api/relay/constant"
-	"github.com/QuantumNous/new-api/types"
-
-	"github.com/gin-gonic/gin"
-)
-
-type Adaptor struct {
-}
-
-func (a *Adaptor) ConvertGeminiRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeminiChatRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertClaudeRequest(*gin.Context, *relaycommon.RelayInfo, *dto.ClaudeRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
-}
-
-func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dto.RerankRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertEmbeddingRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.EmbeddingRequest) (any, error) {
-	return nil, errors.New("codex channel: endpoint not supported")
-}
-
-func (a *Adaptor) ConvertOpenAIResponsesRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.OpenAIResponsesRequest) (any, error) {
-	isCompact := info != nil && info.RelayMode == relayconstant.RelayModeResponsesCompact
-
-	if info != nil && info.ChannelSetting.SystemPrompt != "" {
-		systemPrompt := info.ChannelSetting.SystemPrompt
-
-		if len(request.Instructions) == 0 {
-			if b, err := common.Marshal(systemPrompt); err == nil {
-				request.Instructions = b
-			} else {
-				return nil, err
-			}
-		} else if info.ChannelSetting.SystemPromptOverride {
-			var existing string
-			if err := common.Unmarshal(request.Instructions, &existing); err == nil {
-				existing = strings.TrimSpace(existing)
-				if existing == "" {
-					if b, err := common.Marshal(systemPrompt); err == nil {
-						request.Instructions = b
-					} else {
-						return nil, err
-					}
-				} else {
-					if b, err := common.Marshal(systemPrompt + "\n" + existing); err == nil {
-						request.Instructions = b
-					} else {
-						return nil, err
-					}
-				}
-			} else {
-				if b, err := common.Marshal(systemPrompt); err == nil {
-					request.Instructions = b
-				} else {
-					return nil, err
-				}
-			}
-		}
-	}
-	if isCompact {
-		return request, nil
-	}
-	// codex: store must be false
-	request.Store = json.RawMessage("false")
-	// rm max_output_tokens
-	request.MaxOutputTokens = 0
-	request.Temperature = nil
-	return request, nil
-}
-
-func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) {
-	return channel.DoApiRequest(a, c, info, requestBody)
-}
-
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
-	if info.RelayMode != relayconstant.RelayModeResponses && info.RelayMode != relayconstant.RelayModeResponsesCompact {
-		return nil, types.NewError(errors.New("codex channel: endpoint not supported"), types.ErrorCodeInvalidRequest)
-	}
-
-	if info.RelayMode == relayconstant.RelayModeResponsesCompact {
-		return openai.OaiResponsesCompactionHandler(c, resp)
-	}
-
-	if info.IsStream {
-		return openai.OaiResponsesStreamHandler(c, info, resp)
-	}
-	return openai.OaiResponsesHandler(c, info, resp)
-}
-
-func (a *Adaptor) GetModelList() []string {
-	return ModelList
-}
-
-func (a *Adaptor) GetChannelName() string {
-	return ChannelName
-}
-
-func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
-	if info.RelayMode != relayconstant.RelayModeResponses && info.RelayMode != relayconstant.RelayModeResponsesCompact {
-		return "", errors.New("codex channel: only /v1/responses and /v1/responses/compact are supported")
-	}
-	path := "/backend-api/codex/responses"
-	if info.RelayMode == relayconstant.RelayModeResponsesCompact {
-		path = "/backend-api/codex/responses/compact"
-	}
-	return relaycommon.GetFullRequestURL(info.ChannelBaseUrl, path, info.ChannelType), nil
-}
-
-func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *relaycommon.RelayInfo) error {
-	channel.SetupApiRequestHeader(info, c, req)
-
-	key := strings.TrimSpace(info.ApiKey)
-	if !strings.HasPrefix(key, "{") {
-		return errors.New("codex channel: key must be a JSON object")
-	}
-
-	oauthKey, err := ParseOAuthKey(key)
-	if err != nil {
-		return err
-	}
-
-	accessToken := strings.TrimSpace(oauthKey.AccessToken)
-	accountID := strings.TrimSpace(oauthKey.AccountID)
-
-	if accessToken == "" {
-		return errors.New("codex channel: access_token is required")
-	}
-	if accountID == "" {
-		return errors.New("codex channel: account_id is required")
-	}
-
-	req.Set("Authorization", "Bearer "+accessToken)
-	req.Set("chatgpt-account-id", accountID)
-
-	if req.Get("OpenAI-Beta") == "" {
-		req.Set("OpenAI-Beta", "responses=experimental")
-	}
-	if req.Get("originator") == "" {
-		req.Set("originator", "codex_cli_rs")
-	}
-
-	return nil
-}
--- a/relay/channel/codex/constants.go
+++ b/relay/channel/codex/constants.go
@@ -1,25 +0,0 @@
-package codex
-
-import (
-	"github.com/QuantumNous/new-api/setting/ratio_setting"
-	"github.com/samber/lo"
-)
-
-var baseModelList = []string{
-	"gpt-5", "gpt-5-codex", "gpt-5-codex-mini",
-	"gpt-5.1", "gpt-5.1-codex", "gpt-5.1-codex-max", "gpt-5.1-codex-mini",
-	"gpt-5.2", "gpt-5.2-codex",
-}
-
-var ModelList = withCompactModelSuffix(baseModelList)
-
-const ChannelName = "codex"
-
-func withCompactModelSuffix(models []string) []string {
-	out := make([]string, 0, len(models)*2)
-	out = append(out, models...)
-	out = append(out, lo.Map(models, func(model string, _ int) string {
-		return ratio_setting.WithCompactModelSuffix(model)
-	})...)
-	return lo.Uniq(out)
-}
--- a/relay/channel/codex/oauth_key.go
+++ b/relay/channel/codex/oauth_key.go
@@ -1,30 +0,0 @@
-package codex
-
-import (
-	"errors"
-
-	"github.com/QuantumNous/new-api/common"
-)
-
-type OAuthKey struct {
-	IDToken      string `json:"id_token,omitempty"`
-	AccessToken  string `json:"access_token,omitempty"`
-	RefreshToken string `json:"refresh_token,omitempty"`
-
-	AccountID   string `json:"account_id,omitempty"`
-	LastRefresh string `json:"last_refresh,omitempty"`
-	Email       string `json:"email,omitempty"`
-	Type        string `json:"type,omitempty"`
-	Expired     string `json:"expired,omitempty"`
-}
-
-func ParseOAuthKey(raw string) (*OAuthKey, error) {
-	if raw == "" {
-		return nil, errors.New("codex channel: empty oauth key")
-	}
-	var key OAuthKey
-	if err := common.Unmarshal([]byte(raw), &key); err != nil {
-		return nil, errors.New("codex channel: invalid oauth key json")
-	}
-	return &key, 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,7 +137,7 @@ 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 != "" {
+		} else if baseModel, level := parseThinkingLevelSuffix(info.UpstreamModelName); level != "" {
 			info.UpstreamModelName = baseModel
 		}
 	}
--- a/relay/channel/gemini/relay-gemini-native.go
+++ b/relay/channel/gemini/relay-gemini-native.go
@@ -1,12 +1,10 @@
 package gemini

 import (
-	"fmt"
 	"io"
 	"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"
@@ -37,10 +35,6 @@ func GeminiTextGenerationHandler(c *gin.Context, info *relaycommon.RelayInfo, re
 		return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
 	}

-	if len(geminiResponse.Candidates) == 0 && geminiResponse.PromptFeedback != nil && geminiResponse.PromptFeedback.BlockReason != nil {
-		common.SetContextKey(c, constant.ContextKeyAdminRejectReason, fmt.Sprintf("gemini_block_reason=%s", *geminiResponse.PromptFeedback.BlockReason))
-	}
-
 	// 计算使用量（基于 UsageMetadata）
 	usage := dto.Usage{
 		PromptTokens:     geminiResponse.UsageMetadata.PromptTokenCount,
--- a/relay/channel/gemini/relay-gemini.go
+++ b/relay/channel/gemini/relay-gemini.go
@@ -1,7 +1,6 @@
 package gemini

 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -9,7 +8,6 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
-	"time"
 	"unicode/utf8"

 	"github.com/QuantumNous/new-api/common"
@@ -34,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,
@@ -101,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)
@@ -122,12 +118,18 @@ 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)
 }

+func parseThinkingLevelSuffix(modelName string) (string, string) {
+	base, level, ok := reasoning.TrimEffortSuffix(modelName)
+	if !ok {
+		return modelName, ""
+	}
+	return base, level
+}
+
 func ThinkingAdaptor(geminiRequest *dto.GeminiChatRequest, info *relaycommon.RelayInfo, oaiRequest ...dto.GeneralOpenAIRequest) {
 	if model_setting.GetGeminiSettings().ThinkingAdapterEnabled {
 		modelName := info.UpstreamModelName
@@ -184,7 +186,7 @@ func ThinkingAdaptor(geminiRequest *dto.GeminiChatRequest, info *relaycommon.Rel
 					ThinkingBudget: common.GetPointer(0),
 				}
 			}
-		} else if _, level, ok := reasoning.TrimEffortSuffix(info.UpstreamModelName); ok && level != "" {
+		} else if _, level := parseThinkingLevelSuffix(modelName); level != "" {
 			geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
 				IncludeThoughts: true,
 				ThinkingLevel:   level,
@@ -359,13 +361,6 @@ func CovertOpenAI2Gemini(c *gin.Context, textRequest dto.GeneralOpenAIRequest, i
 			})
 		}
 		geminiRequest.SetTools(geminiTools)
-
-		// [NEW] Convert OpenAI tool_choice to Gemini toolConfig.functionCallingConfig
-		// Mapping: "auto" -> "AUTO", "none" -> "NONE", "required" -> "ANY"
-		// Object format: {"type": "function", "function": {"name": "xxx"}} -> "ANY" + allowedFunctionNames
-		if textRequest.ToolChoice != nil {
-			geminiRequest.ToolConfig = convertToolChoiceToGeminiConfig(textRequest.ToolChoice)
-		}
 	}

 	if textRequest.ResponseFormat != nil && (textRequest.ResponseFormat.Type == "json_schema" || textRequest.ResponseFormat.Type == "json_object") {
@@ -384,7 +379,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" {
@@ -662,84 +657,101 @@ func getSupportedMimeTypesList() []string {
 	return keys
 }

-var geminiOpenAPISchemaAllowedFields = map[string]struct{}{
-	"anyOf":            {},
-	"default":          {},
-	"description":      {},
-	"enum":             {},
-	"example":          {},
-	"format":           {},
-	"items":            {},
-	"maxItems":         {},
-	"maxLength":        {},
-	"maxProperties":    {},
-	"maximum":          {},
-	"minItems":         {},
-	"minLength":        {},
-	"minProperties":    {},
-	"minimum":          {},
-	"nullable":         {},
-	"pattern":          {},
-	"properties":       {},
-	"propertyOrdering": {},
-	"required":         {},
-	"title":            {},
-	"type":             {},
-}
-
-const geminiFunctionSchemaMaxDepth = 64
-
 // cleanFunctionParameters recursively removes unsupported fields from Gemini function parameters.
 func cleanFunctionParameters(params interface{}) interface{} {
-	return cleanFunctionParametersWithDepth(params, 0)
-}
-
-func cleanFunctionParametersWithDepth(params interface{}, depth int) interface{} {
 	if params == nil {
 		return nil
 	}

-	if depth >= geminiFunctionSchemaMaxDepth {
-		return cleanFunctionParametersShallow(params)
-	}
-
 	switch v := params.(type) {
 	case map[string]interface{}:
-		// Keep only Gemini-supported OpenAPI schema subset fields (per official SDK Schema).
-		cleanedMap := make(map[string]interface{}, len(v))
+		// Create a copy to avoid modifying the original
+		cleanedMap := make(map[string]interface{})
 		for k, val := range v {
-			if _, ok := geminiOpenAPISchemaAllowedFields[k]; ok {
-				cleanedMap[k] = val
-			}
+			cleanedMap[k] = val
 		}

-		normalizeGeminiSchemaTypeAndNullable(cleanedMap)
+		// Remove unsupported root-level fields
+		delete(cleanedMap, "default")
+		delete(cleanedMap, "exclusiveMaximum")
+		delete(cleanedMap, "exclusiveMinimum")
+		delete(cleanedMap, "$schema")
+		delete(cleanedMap, "additionalProperties")
+
+		// Check and clean 'format' for string types
+		if propType, typeExists := cleanedMap["type"].(string); typeExists && propType == "string" {
+			if formatValue, formatExists := cleanedMap["format"].(string); formatExists {
+				if formatValue != "enum" && formatValue != "date-time" {
+					delete(cleanedMap, "format")
+				}
+			}
+		}

 		// Clean properties
 		if props, ok := cleanedMap["properties"].(map[string]interface{}); ok && props != nil {
 			cleanedProps := make(map[string]interface{})
 			for propName, propValue := range props {
-				cleanedProps[propName] = cleanFunctionParametersWithDepth(propValue, depth+1)
+				cleanedProps[propName] = cleanFunctionParameters(propValue)
 			}
 			cleanedMap["properties"] = cleanedProps
 		}

 		// Recursively clean items in arrays
 		if items, ok := cleanedMap["items"].(map[string]interface{}); ok && items != nil {
-			cleanedMap["items"] = cleanFunctionParametersWithDepth(items, depth+1)
+			cleanedMap["items"] = cleanFunctionParameters(items)
 		}
-		// OpenAPI tuple-style items is not supported by Gemini SDK Schema; keep first to avoid API rejection.
-		if itemsArray, ok := cleanedMap["items"].([]interface{}); ok && len(itemsArray) > 0 {
-			cleanedMap["items"] = cleanFunctionParametersWithDepth(itemsArray[0], depth+1)
+		// Also handle items if it's an array of schemas
+		if itemsArray, ok := cleanedMap["items"].([]interface{}); ok {
+			cleanedItemsArray := make([]interface{}, len(itemsArray))
+			for i, item := range itemsArray {
+				cleanedItemsArray[i] = cleanFunctionParameters(item)
+			}
+			cleanedMap["items"] = cleanedItemsArray
 		}

-		// Recursively clean anyOf
-		if nested, ok := cleanedMap["anyOf"].([]interface{}); ok && nested != nil {
-			cleanedNested := make([]interface{}, len(nested))
-			for i, item := range nested {
-				cleanedNested[i] = cleanFunctionParametersWithDepth(item, depth+1)
+		// Recursively clean other schema composition keywords
+		for _, field := range []string{"allOf", "anyOf", "oneOf"} {
+			if nested, ok := cleanedMap[field].([]interface{}); ok {
+				cleanedNested := make([]interface{}, len(nested))
+				for i, item := range nested {
+					cleanedNested[i] = cleanFunctionParameters(item)
+				}
+				cleanedMap[field] = cleanedNested
+			}
+		}
+
+		// Recursively clean patternProperties
+		if patternProps, ok := cleanedMap["patternProperties"].(map[string]interface{}); ok {
+			cleanedPatternProps := make(map[string]interface{})
+			for pattern, schema := range patternProps {
+				cleanedPatternProps[pattern] = cleanFunctionParameters(schema)
+			}
+			cleanedMap["patternProperties"] = cleanedPatternProps
+		}
+
+		// Recursively clean definitions
+		if definitions, ok := cleanedMap["definitions"].(map[string]interface{}); ok {
+			cleanedDefinitions := make(map[string]interface{})
+			for defName, defSchema := range definitions {
+				cleanedDefinitions[defName] = cleanFunctionParameters(defSchema)
+			}
+			cleanedMap["definitions"] = cleanedDefinitions
+		}
+
+		// Recursively clean $defs (newer JSON Schema draft)
+		if defs, ok := cleanedMap["$defs"].(map[string]interface{}); ok {
+			cleanedDefs := make(map[string]interface{})
+			for defName, defSchema := range defs {
+				cleanedDefs[defName] = cleanFunctionParameters(defSchema)
+			}
+			cleanedMap["$defs"] = cleanedDefs
+		}
+
+		// Clean conditional keywords
+		for _, field := range []string{"if", "then", "else", "not"} {
+			if nested, ok := cleanedMap[field]; ok {
+				cleanedMap[field] = cleanFunctionParameters(nested)
 			}
-			cleanedMap["anyOf"] = cleanedNested
 		}

 		return cleanedMap
@@ -748,7 +760,7 @@ func cleanFunctionParametersWithDepth(params interface{}, depth int) interface{}
 		// Handle arrays of schemas
 		cleanedArray := make([]interface{}, len(v))
 		for i, item := range v {
-			cleanedArray[i] = cleanFunctionParametersWithDepth(item, depth+1)
+			cleanedArray[i] = cleanFunctionParameters(item)
 		}
 		return cleanedArray

@@ -758,91 +770,6 @@ func cleanFunctionParametersWithDepth(params interface{}, depth int) interface{}
 	}
 }

-func cleanFunctionParametersShallow(params interface{}) interface{} {
-	switch v := params.(type) {
-	case map[string]interface{}:
-		cleanedMap := make(map[string]interface{}, len(v))
-		for k, val := range v {
-			if _, ok := geminiOpenAPISchemaAllowedFields[k]; ok {
-				cleanedMap[k] = val
-			}
-		}
-		normalizeGeminiSchemaTypeAndNullable(cleanedMap)
-		// Stop recursion and avoid retaining huge nested structures.
-		delete(cleanedMap, "properties")
-		delete(cleanedMap, "items")
-		delete(cleanedMap, "anyOf")
-		return cleanedMap
-	case []interface{}:
-		// Prefer an empty list over deep recursion on attacker-controlled inputs.
-		return []interface{}{}
-	default:
-		return params
-	}
-}
-
-func normalizeGeminiSchemaTypeAndNullable(schema map[string]interface{}) {
-	rawType, ok := schema["type"]
-	if !ok || rawType == nil {
-		return
-	}
-
-	normalize := func(t string) (string, bool) {
-		switch strings.ToLower(strings.TrimSpace(t)) {
-		case "object":
-			return "OBJECT", false
-		case "array":
-			return "ARRAY", false
-		case "string":
-			return "STRING", false
-		case "integer":
-			return "INTEGER", false
-		case "number":
-			return "NUMBER", false
-		case "boolean":
-			return "BOOLEAN", false
-		case "null":
-			return "", true
-		default:
-			return t, false
-		}
-	}
-
-	switch t := rawType.(type) {
-	case string:
-		normalized, isNull := normalize(t)
-		if isNull {
-			schema["nullable"] = true
-			delete(schema, "type")
-			return
-		}
-		schema["type"] = normalized
-	case []interface{}:
-		nullable := false
-		var chosen string
-		for _, item := range t {
-			if s, ok := item.(string); ok {
-				normalized, isNull := normalize(s)
-				if isNull {
-					nullable = true
-					continue
-				}
-				if chosen == "" {
-					chosen = normalized
-				}
-			}
-		}
-		if nullable {
-			schema["nullable"] = true
-		}
-		if chosen != "" {
-			schema["type"] = chosen
-		} else {
-			delete(schema, "type")
-		}
-	}
-}
-
 func removeAdditionalPropertiesWithDepth(schema interface{}, depth int) interface{} {
 	if depth >= 5 {
 		return schema
@@ -1038,24 +965,6 @@ func responseGeminiChat2OpenAI(c *gin.Context, response *dto.GeminiChatResponse)
 				choice.FinishReason = constant.FinishReasonStop
 			case "MAX_TOKENS":
 				choice.FinishReason = constant.FinishReasonLength
-			case "SAFETY":
-				// Safety filter triggered
-				choice.FinishReason = constant.FinishReasonContentFilter
-			case "RECITATION":
-				// Recitation (citation) detected
-				choice.FinishReason = constant.FinishReasonContentFilter
-			case "BLOCKLIST":
-				// Blocklist triggered
-				choice.FinishReason = constant.FinishReasonContentFilter
-			case "PROHIBITED_CONTENT":
-				// Prohibited content detected
-				choice.FinishReason = constant.FinishReasonContentFilter
-			case "SPII":
-				// Sensitive personally identifiable information
-				choice.FinishReason = constant.FinishReasonContentFilter
-			case "OTHER":
-				// Other reasons
-				choice.FinishReason = constant.FinishReasonContentFilter
 			default:
 				choice.FinishReason = constant.FinishReasonContentFilter
 			}
@@ -1087,34 +996,13 @@ func streamResponseGeminiChat2OpenAI(geminiResponse *dto.GeminiChatResponse) (*d
 		isTools := false
 		isThought := false
 		if candidate.FinishReason != nil {
-			// Map Gemini FinishReason to OpenAI finish_reason
+			// p := GeminiConvertFinishReason(*candidate.FinishReason)
 			switch *candidate.FinishReason {
 			case "STOP":
-				// Normal completion
 				choice.FinishReason = &constant.FinishReasonStop
 			case "MAX_TOKENS":
-				// Reached maximum token limit
 				choice.FinishReason = &constant.FinishReasonLength
-			case "SAFETY":
-				// Safety filter triggered
-				choice.FinishReason = &constant.FinishReasonContentFilter
-			case "RECITATION":
-				// Recitation (citation) detected
-				choice.FinishReason = &constant.FinishReasonContentFilter
-			case "BLOCKLIST":
-				// Blocklist triggered
-				choice.FinishReason = &constant.FinishReasonContentFilter
-			case "PROHIBITED_CONTENT":
-				// Prohibited content detected
-				choice.FinishReason = &constant.FinishReasonContentFilter
-			case "SPII":
-				// Sensitive personally identifiable information
-				choice.FinishReason = &constant.FinishReasonContentFilter
-			case "OTHER":
-				// Other reasons
-				choice.FinishReason = &constant.FinishReasonContentFilter
 			default:
-				// Unknown reason, treat as content filter
 				choice.FinishReason = &constant.FinishReasonContentFilter
 			}
 		}
@@ -1197,10 +1085,6 @@ func geminiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
 			return false
 		}

-		if len(geminiResponse.Candidates) == 0 && geminiResponse.PromptFeedback != nil && geminiResponse.PromptFeedback.BlockReason != nil {
-			common.SetContextKey(c, constant.ContextKeyAdminRejectReason, fmt.Sprintf("gemini_block_reason=%s", *geminiResponse.PromptFeedback.BlockReason))
-		}
-
 		// 统计图片数量
 		for _, candidate := range geminiResponse.Candidates {
 			for _, part := range candidate.Content.Parts {
@@ -1258,8 +1142,6 @@ func GeminiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *
 	id := helper.GetResponseID(c)
 	createAt := common.GetTimestamp()
 	finishReason := constant.FinishReasonStop
-	toolCallIndexByChoice := make(map[int]map[string]int)
-	nextToolCallIndexByChoice := make(map[int]int)

 	usage, err := geminiStreamHandler(c, info, resp, func(data string, geminiResponse *dto.GeminiChatResponse) bool {
 		response, isStop := streamResponseGeminiChat2OpenAI(geminiResponse)
@@ -1267,28 +1149,6 @@ func GeminiChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *
 		response.Id = id
 		response.Created = createAt
 		response.Model = info.UpstreamModelName
-		for choiceIdx := range response.Choices {
-			choiceKey := response.Choices[choiceIdx].Index
-			for toolIdx := range response.Choices[choiceIdx].Delta.ToolCalls {
-				tool := &response.Choices[choiceIdx].Delta.ToolCalls[toolIdx]
-				if tool.ID == "" {
-					continue
-				}
-				m := toolCallIndexByChoice[choiceKey]
-				if m == nil {
-					m = make(map[string]int)
-					toolCallIndexByChoice[choiceKey] = m
-				}
-				if idx, ok := m[tool.ID]; ok {
-					tool.SetIndex(idx)
-					continue
-				}
-				idx := nextToolCallIndexByChoice[choiceKey]
-				nextToolCallIndexByChoice[choiceKey] = idx + 1
-				m[tool.ID] = idx
-				tool.SetIndex(idx)
-			}
-		}

 		logger.LogDebug(c, fmt.Sprintf("info.SendResponseCount = %d", info.SendResponseCount))
 		if info.SendResponseCount == 0 {
@@ -1359,52 +1219,12 @@ func GeminiChatHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.R
 		return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
 	}
 	if len(geminiResponse.Candidates) == 0 {
-		usage := dto.Usage{
-			PromptTokens: geminiResponse.UsageMetadata.PromptTokenCount,
-		}
-		usage.CompletionTokenDetails.ReasoningTokens = geminiResponse.UsageMetadata.ThoughtsTokenCount
-		for _, detail := range geminiResponse.UsageMetadata.PromptTokensDetails {
-			if detail.Modality == "AUDIO" {
-				usage.PromptTokensDetails.AudioTokens = detail.TokenCount
-			} else if detail.Modality == "TEXT" {
-				usage.PromptTokensDetails.TextTokens = detail.TokenCount
-			}
-		}
-		if usage.PromptTokens <= 0 {
-			usage.PromptTokens = info.GetEstimatePromptTokens()
-		}
-
-		var newAPIError *types.NewAPIError
-		if geminiResponse.PromptFeedback != nil && geminiResponse.PromptFeedback.BlockReason != nil {
-			common.SetContextKey(c, constant.ContextKeyAdminRejectReason, fmt.Sprintf("gemini_block_reason=%s", *geminiResponse.PromptFeedback.BlockReason))
-			newAPIError = types.NewOpenAIError(
-				errors.New("request blocked by Gemini API: "+*geminiResponse.PromptFeedback.BlockReason),
-				types.ErrorCodePromptBlocked,
-				http.StatusBadRequest,
-			)
-		} else {
-			common.SetContextKey(c, constant.ContextKeyAdminRejectReason, "gemini_empty_candidates")
-			newAPIError = types.NewOpenAIError(
-				errors.New("empty response from Gemini API"),
-				types.ErrorCodeEmptyResponse,
-				http.StatusInternalServerError,
-			)
-		}
-
-		service.ResetStatusCode(newAPIError, c.GetString("status_code_mapping"))
-
-		switch info.RelayFormat {
-		case types.RelayFormatClaude:
-			c.JSON(newAPIError.StatusCode, gin.H{
-				"type":  "error",
-				"error": newAPIError.ToClaudeError(),
-			})
-		default:
-			c.JSON(newAPIError.StatusCode, gin.H{
-				"error": newAPIError.ToOpenAIError(),
-			})
-		}
-		return &usage, nil
+		//return nil, types.NewOpenAIError(errors.New("no candidates returned"), types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
+		//if geminiResponse.PromptFeedback != nil && geminiResponse.PromptFeedback.BlockReason != nil {
+		//	return nil, types.NewOpenAIError(errors.New("request blocked by Gemini API: "+*geminiResponse.PromptFeedback.BlockReason), types.ErrorCodePromptBlocked, http.StatusBadRequest)
+		//} else {
+		//	return nil, types.NewOpenAIError(errors.New("empty response from Gemini API"), types.ErrorCodeEmptyResponse, http.StatusInternalServerError)
+		//}
 	}
 	fullTextResponse := responseGeminiChat2OpenAI(c, &geminiResponse)
 	fullTextResponse.Model = info.UpstreamModelName
@@ -1547,135 +1367,3 @@ func GeminiImageHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.

 	return usage, nil
 }
-
-type GeminiModelsResponse struct {
-	Models        []dto.GeminiModel `json:"models"`
-	NextPageToken string            `json:"nextPageToken"`
-}
-
-func FetchGeminiModels(baseURL, apiKey, proxyURL string) ([]string, error) {
-	client, err := service.GetHttpClientWithProxy(proxyURL)
-	if err != nil {
-		return nil, fmt.Errorf("创建HTTP客户端失败: %v", err)
-	}
-
-	allModels := make([]string, 0)
-	nextPageToken := ""
-	maxPages := 100 // Safety limit to prevent infinite loops
-
-	for page := 0; page < maxPages; page++ {
-		url := fmt.Sprintf("%s/v1beta/models", baseURL)
-		if nextPageToken != "" {
-			url = fmt.Sprintf("%s?pageToken=%s", url, nextPageToken)
-		}
-
-		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-		request, err := http.NewRequestWithContext(ctx, "GET", url, nil)
-		if err != nil {
-			cancel()
-			return nil, fmt.Errorf("创建请求失败: %v", err)
-		}
-
-		request.Header.Set("x-goog-api-key", apiKey)
-
-		response, err := client.Do(request)
-		if err != nil {
-			cancel()
-			return nil, fmt.Errorf("请求失败: %v", err)
-		}
-
-		if response.StatusCode != http.StatusOK {
-			body, _ := io.ReadAll(response.Body)
-			response.Body.Close()
-			cancel()
-			return nil, fmt.Errorf("服务器返回错误 %d: %s", response.StatusCode, string(body))
-		}
-
-		body, err := io.ReadAll(response.Body)
-		response.Body.Close()
-		cancel()
-		if err != nil {
-			return nil, fmt.Errorf("读取响应失败: %v", err)
-		}
-
-		var modelsResponse GeminiModelsResponse
-		if err = common.Unmarshal(body, &modelsResponse); err != nil {
-			return nil, fmt.Errorf("解析响应失败: %v", err)
-		}
-
-		for _, model := range modelsResponse.Models {
-			modelNameValue, ok := model.Name.(string)
-			if !ok {
-				continue
-			}
-			modelName := strings.TrimPrefix(modelNameValue, "models/")
-			allModels = append(allModels, modelName)
-		}
-
-		nextPageToken = modelsResponse.NextPageToken
-		if nextPageToken == "" {
-			break
-		}
-	}
-
-	return allModels, nil
-}
-
-// convertToolChoiceToGeminiConfig converts OpenAI tool_choice to Gemini toolConfig
-// OpenAI tool_choice values:
-//   - "auto": Let the model decide (default)
-//   - "none": Don't call any tools
-//   - "required": Must call at least one tool
-//   - {"type": "function", "function": {"name": "xxx"}}: Call specific function
-//
-// Gemini functionCallingConfig.mode values:
-//   - "AUTO": Model decides whether to call functions
-//   - "NONE": Model won't call functions
-//   - "ANY": Model must call at least one function
-func convertToolChoiceToGeminiConfig(toolChoice any) *dto.ToolConfig {
-	if toolChoice == nil {
-		return nil
-	}
-
-	// Handle string values: "auto", "none", "required"
-	if toolChoiceStr, ok := toolChoice.(string); ok {
-		config := &dto.ToolConfig{
-			FunctionCallingConfig: &dto.FunctionCallingConfig{},
-		}
-		switch toolChoiceStr {
-		case "auto":
-			config.FunctionCallingConfig.Mode = "AUTO"
-		case "none":
-			config.FunctionCallingConfig.Mode = "NONE"
-		case "required":
-			config.FunctionCallingConfig.Mode = "ANY"
-		default:
-			// Unknown string value, default to AUTO
-			config.FunctionCallingConfig.Mode = "AUTO"
-		}
-		return config
-	}
-
-	// Handle object value: {"type": "function", "function": {"name": "xxx"}}
-	if toolChoiceMap, ok := toolChoice.(map[string]interface{}); ok {
-		if toolChoiceMap["type"] == "function" {
-			config := &dto.ToolConfig{
-				FunctionCallingConfig: &dto.FunctionCallingConfig{
-					Mode: "ANY",
-				},
-			}
-			// Extract function name if specified
-			if function, ok := toolChoiceMap["function"].(map[string]interface{}); ok {
-				if name, ok := function["name"].(string); ok && name != "" {
-					config.FunctionCallingConfig.AllowedFunctionNames = []string{name}
-				}
-			}
-			return config
-		}
-		// Unsupported map structure (type is not "function"), return nil
-		return nil
-	}
-
-	// Unsupported type, return nil
-	return nil
-}
--- a/relay/channel/minimax/constants.go
+++ b/relay/channel/minimax/constants.go
@@ -14,9 +14,6 @@ var ModelList = []string{
 	"speech-02-turbo",
 	"speech-01-hd",
 	"speech-01-turbo",
-	"MiniMax-M2.1",
-	"MiniMax-M2.1-lightning",
-	"MiniMax-M2",
 }

 var ChannelName = "minimax"
--- 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
@@ -187,17 +187,6 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, header *http.Header, info *
 	if info.ChannelType == constant.ChannelTypeOpenAI && "" != info.Organization {
 		header.Set("OpenAI-Organization", info.Organization)
 	}
-	// 检查 Header Override 是否已设置 Authorization，如果已设置则跳过默认设置
-	// 这样可以避免在 Header Override 应用时被覆盖（虽然 Header Override 会在之后应用，但这里作为额外保护）
-	hasAuthOverride := false
-	if len(info.HeadersOverride) > 0 {
-		for k := range info.HeadersOverride {
-			if strings.EqualFold(k, "Authorization") {
-				hasAuthOverride = true
-				break
-			}
-		}
-	}
 	if info.RelayMode == relayconstant.RelayModeRealtime {
 		swp := c.Request.Header.Get("Sec-WebSocket-Protocol")
 		if swp != "" {
@@ -212,14 +201,10 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, header *http.Header, info *
 			//req.Header.Set("Sec-Websocket-Version", c.Request.Header.Get("Sec-Websocket-Version"))
 		} else {
 			header.Set("openai-beta", "realtime=v1")
-			if !hasAuthOverride {
-				header.Set("Authorization", "Bearer "+info.ApiKey)
-			}
-		}
-	} else {
-		if !hasAuthOverride {
 			header.Set("Authorization", "Bearer "+info.ApiKey)
 		}
+	} else {
+		header.Set("Authorization", "Bearer "+info.ApiKey)
 	}
 	if info.ChannelType == constant.ChannelTypeOpenRouter {
 		header.Set("HTTP-Referer", "https://www.newapi.ai")
@@ -620,8 +605,6 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
 		} else {
 			usage, err = OaiResponsesHandler(c, info, resp)
 		}
-	case relayconstant.RelayModeResponsesCompact:
-		usage, err = OaiResponsesCompactionHandler(c, resp)
 	default:
 		if info.IsStream {
 			usage, err = OaiStreamHandler(c, info, resp)
--- a/relay/channel/openai/chat_via_responses.go
+++ b/relay/channel/openai/chat_via_responses.go
@@ -1,369 +0,0 @@
-package openai
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"
-	"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 OaiResponsesToChatHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
-	if resp == nil || resp.Body == nil {
-		return nil, types.NewOpenAIError(fmt.Errorf("invalid response"), types.ErrorCodeBadResponse, http.StatusInternalServerError)
-	}
-
-	defer service.CloseResponseBodyGracefully(resp)
-
-	var responsesResp dto.OpenAIResponsesResponse
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
-	}
-
-	if err := common.Unmarshal(body, &responsesResp); err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
-	}
-
-	if oaiError := responsesResp.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
-		return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
-	}
-
-	chatId := helper.GetResponseID(c)
-	chatResp, usage, err := service.ResponsesResponseToChatCompletionsResponse(&responsesResp, chatId)
-	if err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
-	}
-
-	if usage == nil || usage.TotalTokens == 0 {
-		text := service.ExtractOutputTextFromResponses(&responsesResp)
-		usage = service.ResponseText2Usage(c, text, info.UpstreamModelName, info.GetEstimatePromptTokens())
-		chatResp.Usage = *usage
-	}
-
-	chatBody, err := common.Marshal(chatResp)
-	if err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeJsonMarshalFailed, http.StatusInternalServerError)
-	}
-
-	service.IOCopyBytesGracefully(c, resp, chatBody)
-	return usage, nil
-}
-
-func OaiResponsesToChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
-	if resp == nil || resp.Body == nil {
-		return nil, types.NewOpenAIError(fmt.Errorf("invalid response"), types.ErrorCodeBadResponse, http.StatusInternalServerError)
-	}
-
-	defer service.CloseResponseBodyGracefully(resp)
-
-	responseId := helper.GetResponseID(c)
-	createAt := time.Now().Unix()
-	model := info.UpstreamModelName
-
-	var (
-		usage       = &dto.Usage{}
-		outputText  strings.Builder
-		usageText   strings.Builder
-		sentStart   bool
-		sentStop    bool
-		sawToolCall bool
-		streamErr   *types.NewAPIError
-	)
-
-	toolCallIndexByID := make(map[string]int)
-	toolCallNameByID := make(map[string]string)
-	toolCallArgsByID := make(map[string]string)
-	toolCallNameSent := make(map[string]bool)
-	toolCallCanonicalIDByItemID := make(map[string]string)
-
-	sendStartIfNeeded := func() bool {
-		if sentStart {
-			return true
-		}
-		if err := helper.ObjectData(c, helper.GenerateStartEmptyResponse(responseId, createAt, model, nil)); err != nil {
-			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-			return false
-		}
-		sentStart = true
-		return true
-	}
-
-	sendToolCallDelta := func(callID string, name string, argsDelta string) bool {
-		if callID == "" {
-			return true
-		}
-		if outputText.Len() > 0 {
-			// Prefer streaming assistant text over tool calls to match non-stream behavior.
-			return true
-		}
-		if !sendStartIfNeeded() {
-			return false
-		}
-
-		idx, ok := toolCallIndexByID[callID]
-		if !ok {
-			idx = len(toolCallIndexByID)
-			toolCallIndexByID[callID] = idx
-		}
-		if name != "" {
-			toolCallNameByID[callID] = name
-		}
-		if toolCallNameByID[callID] != "" {
-			name = toolCallNameByID[callID]
-		}
-
-		tool := dto.ToolCallResponse{
-			ID:   callID,
-			Type: "function",
-			Function: dto.FunctionResponse{
-				Arguments: argsDelta,
-			},
-		}
-		tool.SetIndex(idx)
-		if name != "" && !toolCallNameSent[callID] {
-			tool.Function.Name = name
-			toolCallNameSent[callID] = true
-		}
-
-		chunk := &dto.ChatCompletionsStreamResponse{
-			Id:      responseId,
-			Object:  "chat.completion.chunk",
-			Created: createAt,
-			Model:   model,
-			Choices: []dto.ChatCompletionsStreamResponseChoice{
-				{
-					Index: 0,
-					Delta: dto.ChatCompletionsStreamResponseChoiceDelta{
-						ToolCalls: []dto.ToolCallResponse{tool},
-					},
-				},
-			},
-		}
-		if err := helper.ObjectData(c, chunk); err != nil {
-			streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-			return false
-		}
-		sawToolCall = true
-
-		// Include tool call data in the local builder for fallback token estimation.
-		if tool.Function.Name != "" {
-			usageText.WriteString(tool.Function.Name)
-		}
-		if argsDelta != "" {
-			usageText.WriteString(argsDelta)
-		}
-		return true
-	}
-
-	helper.StreamScannerHandler(c, resp, info, func(data string) bool {
-		if streamErr != nil {
-			return false
-		}
-
-		var streamResp dto.ResponsesStreamResponse
-		if err := common.UnmarshalJsonStr(data, &streamResp); err != nil {
-			logger.LogError(c, "failed to unmarshal responses stream event: "+err.Error())
-			return true
-		}
-
-		switch streamResp.Type {
-		case "response.created":
-			if streamResp.Response != nil {
-				if streamResp.Response.Model != "" {
-					model = streamResp.Response.Model
-				}
-				if streamResp.Response.CreatedAt != 0 {
-					createAt = int64(streamResp.Response.CreatedAt)
-				}
-			}
-
-		case "response.output_text.delta":
-			if !sendStartIfNeeded() {
-				return false
-			}
-
-			if streamResp.Delta != "" {
-				outputText.WriteString(streamResp.Delta)
-				usageText.WriteString(streamResp.Delta)
-				delta := streamResp.Delta
-				chunk := &dto.ChatCompletionsStreamResponse{
-					Id:      responseId,
-					Object:  "chat.completion.chunk",
-					Created: createAt,
-					Model:   model,
-					Choices: []dto.ChatCompletionsStreamResponseChoice{
-						{
-							Index: 0,
-							Delta: dto.ChatCompletionsStreamResponseChoiceDelta{
-								Content: &delta,
-							},
-						},
-					},
-				}
-				if err := helper.ObjectData(c, chunk); err != nil {
-					streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-					return false
-				}
-			}
-
-		case "response.output_item.added", "response.output_item.done":
-			if streamResp.Item == nil {
-				break
-			}
-			if streamResp.Item.Type != "function_call" {
-				break
-			}
-
-			itemID := strings.TrimSpace(streamResp.Item.ID)
-			callID := strings.TrimSpace(streamResp.Item.CallId)
-			if callID == "" {
-				callID = itemID
-			}
-			if itemID != "" && callID != "" {
-				toolCallCanonicalIDByItemID[itemID] = callID
-			}
-			name := strings.TrimSpace(streamResp.Item.Name)
-			if name != "" {
-				toolCallNameByID[callID] = name
-			}
-
-			newArgs := streamResp.Item.Arguments
-			prevArgs := toolCallArgsByID[callID]
-			argsDelta := ""
-			if newArgs != "" {
-				if strings.HasPrefix(newArgs, prevArgs) {
-					argsDelta = newArgs[len(prevArgs):]
-				} else {
-					argsDelta = newArgs
-				}
-				toolCallArgsByID[callID] = newArgs
-			}
-
-			if !sendToolCallDelta(callID, name, argsDelta) {
-				return false
-			}
-
-		case "response.function_call_arguments.delta":
-			itemID := strings.TrimSpace(streamResp.ItemID)
-			callID := toolCallCanonicalIDByItemID[itemID]
-			if callID == "" {
-				callID = itemID
-			}
-			if callID == "" {
-				break
-			}
-			toolCallArgsByID[callID] += streamResp.Delta
-			if !sendToolCallDelta(callID, "", streamResp.Delta) {
-				return false
-			}
-
-		case "response.function_call_arguments.done":
-
-		case "response.completed":
-			if streamResp.Response != nil {
-				if streamResp.Response.Model != "" {
-					model = streamResp.Response.Model
-				}
-				if streamResp.Response.CreatedAt != 0 {
-					createAt = int64(streamResp.Response.CreatedAt)
-				}
-				if streamResp.Response.Usage != nil {
-					if streamResp.Response.Usage.InputTokens != 0 {
-						usage.PromptTokens = streamResp.Response.Usage.InputTokens
-						usage.InputTokens = streamResp.Response.Usage.InputTokens
-					}
-					if streamResp.Response.Usage.OutputTokens != 0 {
-						usage.CompletionTokens = streamResp.Response.Usage.OutputTokens
-						usage.OutputTokens = streamResp.Response.Usage.OutputTokens
-					}
-					if streamResp.Response.Usage.TotalTokens != 0 {
-						usage.TotalTokens = streamResp.Response.Usage.TotalTokens
-					} else {
-						usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
-					}
-					if streamResp.Response.Usage.InputTokensDetails != nil {
-						usage.PromptTokensDetails.CachedTokens = streamResp.Response.Usage.InputTokensDetails.CachedTokens
-						usage.PromptTokensDetails.ImageTokens = streamResp.Response.Usage.InputTokensDetails.ImageTokens
-						usage.PromptTokensDetails.AudioTokens = streamResp.Response.Usage.InputTokensDetails.AudioTokens
-					}
-					if streamResp.Response.Usage.CompletionTokenDetails.ReasoningTokens != 0 {
-						usage.CompletionTokenDetails.ReasoningTokens = streamResp.Response.Usage.CompletionTokenDetails.ReasoningTokens
-					}
-				}
-			}
-
-			if !sendStartIfNeeded() {
-				return false
-			}
-			if !sentStop {
-				finishReason := "stop"
-				if sawToolCall && outputText.Len() == 0 {
-					finishReason = "tool_calls"
-				}
-				stop := helper.GenerateStopResponse(responseId, createAt, model, finishReason)
-				if err := helper.ObjectData(c, stop); err != nil {
-					streamErr = types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-					return false
-				}
-				sentStop = true
-			}
-
-		case "response.error", "response.failed":
-			if streamResp.Response != nil {
-				if oaiErr := streamResp.Response.GetOpenAIError(); oaiErr != nil && oaiErr.Type != "" {
-					streamErr = types.WithOpenAIError(*oaiErr, http.StatusInternalServerError)
-					return false
-				}
-			}
-			streamErr = types.NewOpenAIError(fmt.Errorf("responses stream error: %s", streamResp.Type), types.ErrorCodeBadResponse, http.StatusInternalServerError)
-			return false
-
-		default:
-		}
-
-		return true
-	})
-
-	if streamErr != nil {
-		return nil, streamErr
-	}
-
-	if usage.TotalTokens == 0 {
-		usage = service.ResponseText2Usage(c, usageText.String(), info.UpstreamModelName, info.GetEstimatePromptTokens())
-	}
-
-	if !sentStart {
-		if err := helper.ObjectData(c, helper.GenerateStartEmptyResponse(responseId, createAt, model, nil)); err != nil {
-			return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-		}
-	}
-	if !sentStop {
-		finishReason := "stop"
-		if sawToolCall && outputText.Len() == 0 {
-			finishReason = "tool_calls"
-		}
-		stop := helper.GenerateStopResponse(responseId, createAt, model, finishReason)
-		if err := helper.ObjectData(c, stop); err != nil {
-			return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-		}
-	}
-	if info.ShouldIncludeUsage && usage != nil {
-		if err := helper.ObjectData(c, helper.GenerateFinalUsageResponse(responseId, createAt, model, *usage)); err != nil {
-			return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-		}
-	}
-
-	helper.Done(c)
-	return usage, nil
-}
--- a/relay/channel/openai/helper.go
+++ b/relay/channel/openai/helper.go
@@ -208,6 +208,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 +221,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
--- a/relay/channel/openai/relay-openai.go
+++ b/relay/channel/openai/relay-openai.go
@@ -186,7 +186,7 @@ func OaiStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Re
 		usage.CompletionTokens += toolCount * 7
 	}

-	applyUsagePostProcessing(info, usage, common.StringToByteSlice(lastStreamData))
+	applyUsagePostProcessing(info, usage, nil)

 	HandleFinalResponse(c, info, lastStreamData, responseId, createAt, model, systemFingerprint, usage, containStreamUsage)

@@ -229,13 +229,6 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
 		return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
 	}

-	for _, choice := range simpleResponse.Choices {
-		if choice.FinishReason == constant.FinishReasonContentFilter {
-			common.SetContextKey(c, constant.ContextKeyAdminRejectReason, "openai_finish_reason=content_filter")
-			break
-		}
-	}
-
 	forceFormat := false
 	if info.ChannelSetting.ForceFormat {
 		forceFormat = true
@@ -604,7 +597,6 @@ func applyUsagePostProcessing(info *relaycommon.RelayInfo, usage *dto.Usage, res
 			usage.PromptTokensDetails.CachedTokens = usage.PromptCacheHitTokens
 		}
 	case constant.ChannelTypeZhipu_v4:
-		// 智普的cached_tokens在标准位置: usage.prompt_tokens_details.cached_tokens
 		if usage.PromptTokensDetails.CachedTokens == 0 {
 			if usage.InputTokensDetails != nil && usage.InputTokensDetails.CachedTokens > 0 {
 				usage.PromptTokensDetails.CachedTokens = usage.InputTokensDetails.CachedTokens
@@ -614,19 +606,6 @@ func applyUsagePostProcessing(info *relaycommon.RelayInfo, usage *dto.Usage, res
 				usage.PromptTokensDetails.CachedTokens = usage.PromptCacheHitTokens
 			}
 		}
-	case constant.ChannelTypeMoonshot:
-		// Moonshot的cached_tokens在非标准位置: choices[].usage.cached_tokens
-		if usage.PromptTokensDetails.CachedTokens == 0 {
-			if usage.InputTokensDetails != nil && usage.InputTokensDetails.CachedTokens > 0 {
-				usage.PromptTokensDetails.CachedTokens = usage.InputTokensDetails.CachedTokens
-			} else if cachedTokens, ok := extractMoonshotCachedTokensFromBody(responseBody); ok {
-				usage.PromptTokensDetails.CachedTokens = cachedTokens
-			} else if cachedTokens, ok := extractCachedTokensFromBody(responseBody); ok {
-				usage.PromptTokensDetails.CachedTokens = cachedTokens
-			} else if usage.PromptCacheHitTokens > 0 {
-				usage.PromptTokensDetails.CachedTokens = usage.PromptCacheHitTokens
-			}
-		}
 	}
 }

@@ -660,32 +639,3 @@ func extractCachedTokensFromBody(body []byte) (int, bool) {
 	}
 	return 0, false
 }
-
-// extractMoonshotCachedTokensFromBody 从Moonshot的非标准位置提取cached_tokens
-// Moonshot的流式响应格式: {"choices":[{"usage":{"cached_tokens":111}}]}
-func extractMoonshotCachedTokensFromBody(body []byte) (int, bool) {
-	if len(body) == 0 {
-		return 0, false
-	}
-
-	var payload struct {
-		Choices []struct {
-			Usage struct {
-				CachedTokens *int `json:"cached_tokens"`
-			} `json:"usage"`
-		} `json:"choices"`
-	}
-
-	if err := common.Unmarshal(body, &payload); err != nil {
-		return 0, false
-	}
-
-	// 遍历choices查找cached_tokens
-	for _, choice := range payload.Choices {
-		if choice.Usage.CachedTokens != nil && *choice.Usage.CachedTokens > 0 {
-			return *choice.Usage.CachedTokens, true
-		}
-	}
-
-	return 0, false
-}
--- a/relay/channel/openai/relay_responses_compact.go
+++ b/relay/channel/openai/relay_responses_compact.go
@@ -1,44 +0,0 @@
-package openai
-
-import (
-	"io"
-	"net/http"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/service"
-	"github.com/QuantumNous/new-api/types"
-
-	"github.com/gin-gonic/gin"
-)
-
-func OaiResponsesCompactionHandler(c *gin.Context, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
-	defer service.CloseResponseBodyGracefully(resp)
-
-	responseBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
-	}
-
-	var compactResp dto.OpenAIResponsesCompactionResponse
-	if err := common.Unmarshal(responseBody, &compactResp); err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
-	}
-	if oaiError := compactResp.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
-		return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
-	}
-
-	service.IOCopyBytesGracefully(c, resp, responseBody)
-
-	usage := dto.Usage{}
-	if compactResp.Usage != nil {
-		usage.PromptTokens = compactResp.Usage.InputTokens
-		usage.CompletionTokens = compactResp.Usage.OutputTokens
-		usage.TotalTokens = compactResp.Usage.TotalTokens
-		if compactResp.Usage.InputTokensDetails != nil {
-			usage.PromptTokensDetails.CachedTokens = compactResp.Usage.InputTokensDetails.CachedTokens
-		}
-	}
-
-	return &usage, nil
-}
--- a/relay/channel/task/ali/adaptor.go
+++ b/relay/channel/task/ali/adaptor.go
@@ -192,10 +192,6 @@ func sizeToResolution(size string) (string, error) {
 func ProcessAliOtherRatios(aliReq *AliVideoRequest) (map[string]float64, error) {
 	otherRatios := make(map[string]float64)
 	aliRatios := map[string]map[string]float64{
-		"wan2.6-i2v": {
-			"720P":  1,
-			"1080P": 1 / 0.6,
-		},
 		"wan2.5-t2v-preview": {
 			"480P":  1,
 			"720P":  2,
@@ -291,9 +287,7 @@ func (a *TaskAdaptor) convertToAliRequest(info *relaycommon.RelayInfo, req relay
 				aliReq.Parameters.Size = "1280*720"
 			}
 		} else {
-			if strings.HasPrefix(req.Model, "wan2.6") {
-				aliReq.Parameters.Resolution = "1080P"
-			} else if strings.HasPrefix(req.Model, "wan2.5") {
+			if strings.HasPrefix(req.Model, "wan2.5") {
 				aliReq.Parameters.Resolution = "1080P"
 			} else if strings.HasPrefix(req.Model, "wan2.2-i2v-flash") {
 				aliReq.Parameters.Resolution = "720P"
--- a/relay/channel/task/doubao/adaptor.go
+++ b/relay/channel/task/doubao/adaptor.go
@@ -6,9 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"time"
-
-	"github.com/QuantumNous/new-api/common"

 	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
@@ -26,36 +23,18 @@ import (
 // ============================

 type ContentItem struct {
-	Type     string          `json:"type"`                // "text", "image_url" or "video"
-	Text     string          `json:"text,omitempty"`      // for text type
-	ImageURL *ImageURL       `json:"image_url,omitempty"` // for image_url type
-	Video    *VideoReference `json:"video,omitempty"`     // for video (sample) type
+	Type     string    `json:"type"`                // "text" or "image_url"
+	Text     string    `json:"text,omitempty"`      // for text type
+	ImageURL *ImageURL `json:"image_url,omitempty"` // for image_url type
 }

 type ImageURL struct {
 	URL string `json:"url"`
 }

-type VideoReference struct {
-	URL string `json:"url"` // Draft video URL
-}
-
 type requestPayload struct {
-	Model                 string         `json:"model"`
-	Content               []ContentItem  `json:"content"`
-	CallbackURL           string         `json:"callback_url,omitempty"`
-	ReturnLastFrame       *dto.BoolValue `json:"return_last_frame,omitempty"`
-	ServiceTier           string         `json:"service_tier,omitempty"`
-	ExecutionExpiresAfter dto.IntValue   `json:"execution_expires_after,omitempty"`
-	GenerateAudio         *dto.BoolValue `json:"generate_audio,omitempty"`
-	Draft                 *dto.BoolValue `json:"draft,omitempty"`
-	Resolution            string         `json:"resolution,omitempty"`
-	Ratio                 string         `json:"ratio,omitempty"`
-	Duration              dto.IntValue   `json:"duration,omitempty"`
-	Frames                dto.IntValue   `json:"frames,omitempty"`
-	Seed                  dto.IntValue   `json:"seed,omitempty"`
-	CameraFixed           *dto.BoolValue `json:"camera_fixed,omitempty"`
-	Watermark             *dto.BoolValue `json:"watermark,omitempty"`
+	Model   string        `json:"model"`
+	Content []ContentItem `json:"content"`
 }

 type responsePayload struct {
@@ -74,7 +53,6 @@ type responseTask struct {
 	Duration        int    `json:"duration"`
 	Ratio           string `json:"ratio"`
 	FramesPerSecond int    `json:"framespersecond"`
-	ServiceTier     string `json:"service_tier"`
 	Usage           struct {
 		CompletionTokens int `json:"completion_tokens"`
 		TotalTokens      int `json:"total_tokens"`
@@ -120,16 +98,16 @@ func (a *TaskAdaptor) BuildRequestHeader(c *gin.Context, req *http.Request, info

 // BuildRequestBody converts request into Doubao specific format.
 func (a *TaskAdaptor) BuildRequestBody(c *gin.Context, info *relaycommon.RelayInfo) (io.Reader, error) {
-	req, err := relaycommon.GetTaskRequest(c)
-	if err != nil {
-		return nil, err
+	v, exists := c.Get("task_request")
+	if !exists {
+		return nil, fmt.Errorf("request not found in context")
 	}
+	req := v.(relaycommon.TaskSubmitReq)

 	body, err := a.convertToRequestPayload(&req)
 	if err != nil {
 		return nil, errors.Wrap(err, "convert request payload failed")
 	}
-	info.UpstreamModelName = body.Model
 	data, err := json.Marshal(body)
 	if err != nil {
 		return nil, err
@@ -163,13 +141,7 @@ func (a *TaskAdaptor) DoResponse(c *gin.Context, resp *http.Response, info *rela
 		return
 	}

-	ov := dto.NewOpenAIVideo()
-	ov.ID = dResp.ID
-	ov.TaskID = dResp.ID
-	ov.CreatedAt = time.Now().Unix()
-	ov.Model = info.OriginModelName
-
-	c.JSON(http.StatusOK, ov)
+	c.JSON(http.StatusOK, gin.H{"task_id": dResp.ID})
 	return dResp.ID, responseBody, nil
 }

@@ -232,15 +204,12 @@ func (a *TaskAdaptor) convertToRequestPayload(req *relaycommon.TaskSubmitReq) (*
 		}
 	}

-	metadata := req.Metadata
-	medaBytes, err := json.Marshal(metadata)
-	if err != nil {
-		return nil, errors.Wrap(err, "metadata marshal metadata failed")
-	}
-	err = json.Unmarshal(medaBytes, &r)
-	if err != nil {
-		return nil, errors.Wrap(err, "unmarshal metadata failed")
-	}
+	// TODO: Add support for additional parameters from metadata
+	// such as ratio, duration, seed, etc.
+	// metadata := req.Metadata
+	// if metadata != nil {
+	//     // Parse and apply metadata parameters
+	// }

 	return &r, nil
 }
@@ -260,7 +229,7 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e
 	case "pending", "queued":
 		taskResult.Status = model.TaskStatusQueued
 		taskResult.Progress = "10%"
-	case "processing", "running":
+	case "processing":
 		taskResult.Status = model.TaskStatusInProgress
 		taskResult.Progress = "50%"
 	case "succeeded":
@@ -282,30 +251,3 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e

 	return &taskResult, nil
 }
-
-func (a *TaskAdaptor) ConvertToOpenAIVideo(originTask *model.Task) ([]byte, error) {
-	var dResp responseTask
-	if err := json.Unmarshal(originTask.Data, &dResp); err != nil {
-		return nil, errors.Wrap(err, "unmarshal doubao task data failed")
-	}
-
-	openAIVideo := dto.NewOpenAIVideo()
-	openAIVideo.ID = originTask.TaskID
-	openAIVideo.TaskID = originTask.TaskID
-	openAIVideo.Status = originTask.Status.ToVideoStatus()
-	openAIVideo.SetProgressStr(originTask.Progress)
-	openAIVideo.SetMetadata("url", dResp.Content.VideoURL)
-	openAIVideo.CreatedAt = originTask.CreatedAt
-	openAIVideo.CompletedAt = originTask.UpdatedAt
-	openAIVideo.Model = originTask.Properties.OriginModelName
-
-	if dResp.Status == "failed" {
-		openAIVideo.Error = &dto.OpenAIVideoError{
-			Message: "task failed",
-			Code:    "failed",
-		}
-	}
-
-	jsonData, _ := common.Marshal(openAIVideo)
-	return jsonData, nil
-}
--- a/relay/channel/task/doubao/constants.go
+++ b/relay/channel/task/doubao/constants.go
@@ -4,7 +4,6 @@ var ModelList = []string{
 	"doubao-seedance-1-0-pro-250528",
 	"doubao-seedance-1-0-lite-t2v",
 	"doubao-seedance-1-0-lite-i2v",
-	"doubao-seedance-1-5-pro-251215",
 }

 var ChannelName = "doubao-video"
--- a/relay/channel/task/jimeng/adaptor.go
+++ b/relay/channel/task/jimeng/adaptor.go
@@ -17,7 +17,6 @@ import (

 	"github.com/QuantumNous/new-api/common"
 	"github.com/QuantumNous/new-api/model"
-	"github.com/samber/lo"

 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
@@ -410,15 +409,14 @@ func (a *TaskAdaptor) convertToRequestPayload(req *relaycommon.TaskSubmitReq) (*

 	// 即梦视频3.0 ReqKey转换
 	// https://www.volcengine.com/docs/85621/1792707
-	imageLen := lo.Max([]int{len(req.Images), len(r.BinaryDataBase64), len(r.ImageUrls)})
 	if strings.Contains(r.ReqKey, "jimeng_v30") {
 		if r.ReqKey == "jimeng_v30_pro" {
 			// 3.0 pro只有固定的jimeng_ti2v_v30_pro
 			r.ReqKey = "jimeng_ti2v_v30_pro"
-		} else if imageLen > 1 {
+		} else if len(req.Images) > 1 {
 			// 多张图片：首尾帧生成
 			r.ReqKey = strings.TrimSuffix(strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_tail_v30", 1), "p")
-		} else if imageLen == 1 {
+		} else if len(req.Images) == 1 {
 			// 单张图片：图生视频
 			r.ReqKey = strings.TrimSuffix(strings.Replace(r.ReqKey, "jimeng_v30", "jimeng_i2v_first_v30", 1), "p")
 		} else {
--- a/relay/channel/task/kling/adaptor.go
+++ b/relay/channel/task/kling/adaptor.go
@@ -346,7 +346,7 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e
 	}
 	taskInfo.Code = resPayload.Code
 	taskInfo.TaskID = resPayload.Data.TaskId
-	taskInfo.Reason = resPayload.Data.TaskStatusMsg
+	taskInfo.Reason = resPayload.Message
 	//任务状态，枚举值：submitted（已提交）、processing（处理中）、succeed（成功）、failed（失败）
 	status := resPayload.Data.TaskStatus
 	switch status {
--- a/relay/channel/vertex/adaptor.go
+++ b/relay/channel/vertex/adaptor.go
@@ -40,7 +40,6 @@ var claudeModelMap = map[string]string{
 	"claude-opus-4-20250514":     "claude-opus-4@20250514",
 	"claude-opus-4-1-20250805":   "claude-opus-4-1@20250805",
 	"claude-sonnet-4-5-20250929": "claude-sonnet-4-5@20250929",
-	"claude-haiku-4-5-20251001":  "claude-haiku-4-5@20251001",
 	"claude-opus-4-5-20251101":   "claude-opus-4-5@20251101",
 }

@@ -52,43 +51,10 @@ type Adaptor struct {
 }

 func (a *Adaptor) ConvertGeminiRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeminiChatRequest) (any, error) {
-	// Vertex AI does not support functionResponse.id; keep it stripped here for consistency.
-	if model_setting.GetGeminiSettings().RemoveFunctionResponseIdEnabled {
-		removeFunctionResponseID(request)
-	}
 	geminiAdaptor := gemini.Adaptor{}
 	return geminiAdaptor.ConvertGeminiRequest(c, info, request)
 }

-func removeFunctionResponseID(request *dto.GeminiChatRequest) {
-	if request == nil {
-		return
-	}
-
-	if len(request.Contents) > 0 {
-		for i := range request.Contents {
-			if len(request.Contents[i].Parts) == 0 {
-				continue
-			}
-			for j := range request.Contents[i].Parts {
-				part := &request.Contents[i].Parts[j]
-				if part.FunctionResponse == nil {
-					continue
-				}
-				if len(part.FunctionResponse.ID) > 0 {
-					part.FunctionResponse.ID = nil
-				}
-			}
-		}
-	}
-
-	if len(request.Requests) > 0 {
-		for i := range request.Requests {
-			removeFunctionResponseID(&request.Requests[i])
-		}
-	}
-}
-
 func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) {
 	if v, ok := claudeModelMap[info.UpstreamModelName]; ok {
 		c.Set("request_model", v)
--- a/relay/channel/volcengine/adaptor.go
+++ b/relay/channel/volcengine/adaptor.go
@@ -270,8 +270,6 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 		//	return fmt.Sprintf("%s/api/v3/images/edits", baseUrl), nil
 		case constant.RelayModeRerank:
 			return fmt.Sprintf("%s/api/v3/rerank", baseUrl), nil
-		case constant.RelayModeResponses:
-			return fmt.Sprintf("%s/api/v3/responses", baseUrl), nil
 		case constant.RelayModeAudioSpeech:
 			if baseUrl == channelconstant.ChannelBaseURLs[channelconstant.ChannelTypeVolcEngine] {
 				return "wss://openspeech.bytedance.com/api/v1/tts/ws_binary", nil
@@ -325,7 +323,7 @@ func (a *Adaptor) ConvertEmbeddingRequest(c *gin.Context, info *relaycommon.Rela
 }

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

 func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) {
--- a/relay/chat_completions_via_responses.go
+++ b/relay/chat_completions_via_responses.go
@@ -1,162 +0,0 @@
-package relay
-
-import (
-	"bytes"
-	"net/http"
-	"strings"
-
-	"github.com/QuantumNous/new-api/common"
-	"github.com/QuantumNous/new-api/constant"
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/relay/channel"
-	openaichannel "github.com/QuantumNous/new-api/relay/channel/openai"
-	relaycommon "github.com/QuantumNous/new-api/relay/common"
-	relayconstant "github.com/QuantumNous/new-api/relay/constant"
-	"github.com/QuantumNous/new-api/service"
-	"github.com/QuantumNous/new-api/types"
-
-	"github.com/gin-gonic/gin"
-)
-
-func applySystemPromptIfNeeded(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) {
-	if info == nil || request == nil {
-		return
-	}
-	if info.ChannelSetting.SystemPrompt == "" {
-		return
-	}
-
-	systemRole := request.GetSystemRoleName()
-
-	containSystemPrompt := false
-	for _, message := range request.Messages {
-		if message.Role == systemRole {
-			containSystemPrompt = true
-			break
-		}
-	}
-	if !containSystemPrompt {
-		systemMessage := dto.Message{
-			Role:    systemRole,
-			Content: info.ChannelSetting.SystemPrompt,
-		}
-		request.Messages = append([]dto.Message{systemMessage}, request.Messages...)
-		return
-	}
-
-	if !info.ChannelSetting.SystemPromptOverride {
-		return
-	}
-
-	common.SetContextKey(c, constant.ContextKeySystemPromptOverride, true)
-	for i, message := range request.Messages {
-		if message.Role != systemRole {
-			continue
-		}
-		if message.IsStringContent() {
-			request.Messages[i].SetStringContent(info.ChannelSetting.SystemPrompt + "\n" + message.StringContent())
-			return
-		}
-		contents := message.ParseContent()
-		contents = append([]dto.MediaContent{
-			{
-				Type: dto.ContentTypeText,
-				Text: info.ChannelSetting.SystemPrompt,
-			},
-		}, contents...)
-		request.Messages[i].Content = contents
-		return
-	}
-}
-
-func chatCompletionsViaResponses(c *gin.Context, info *relaycommon.RelayInfo, adaptor channel.Adaptor, request *dto.GeneralOpenAIRequest) (*dto.Usage, *types.NewAPIError) {
-	overrideCtx := relaycommon.BuildParamOverrideContext(info)
-	chatJSON, err := common.Marshal(request)
-	if err != nil {
-		return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
-	}
-
-	chatJSON, err = relaycommon.RemoveDisabledFields(chatJSON, info.ChannelOtherSettings)
-	if err != nil {
-		return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
-	}
-
-	if len(info.ParamOverride) > 0 {
-		chatJSON, err = relaycommon.ApplyParamOverride(chatJSON, info.ParamOverride, overrideCtx)
-		if err != nil {
-			return nil, types.NewError(err, types.ErrorCodeChannelParamOverrideInvalid, types.ErrOptionWithSkipRetry())
-		}
-	}
-
-	var overriddenChatReq dto.GeneralOpenAIRequest
-	if err := common.Unmarshal(chatJSON, &overriddenChatReq); err != nil {
-		return nil, types.NewError(err, types.ErrorCodeChannelParamOverrideInvalid, types.ErrOptionWithSkipRetry())
-	}
-
-	responsesReq, err := service.ChatCompletionsRequestToResponsesRequest(&overriddenChatReq)
-	if err != nil {
-		return nil, types.NewErrorWithStatusCode(err, types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
-	}
-	info.AppendRequestConversion(types.RelayFormatOpenAIResponses)
-
-	savedRelayMode := info.RelayMode
-	savedRequestURLPath := info.RequestURLPath
-	defer func() {
-		info.RelayMode = savedRelayMode
-		info.RequestURLPath = savedRequestURLPath
-	}()
-
-	info.RelayMode = relayconstant.RelayModeResponses
-	info.RequestURLPath = "/v1/responses"
-
-	convertedRequest, err := adaptor.ConvertOpenAIResponsesRequest(c, info, *responsesReq)
-	if err != nil {
-		return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
-	}
-	relaycommon.AppendRequestConversionFromRequest(info, convertedRequest)
-
-	jsonData, err := common.Marshal(convertedRequest)
-	if err != nil {
-		return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
-	}
-
-	jsonData, err = relaycommon.RemoveDisabledFields(jsonData, info.ChannelOtherSettings)
-	if err != nil {
-		return nil, types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
-	}
-
-	var httpResp *http.Response
-	resp, err := adaptor.DoRequest(c, info, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return nil, types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError)
-	}
-	if resp == nil {
-		return nil, types.NewOpenAIError(nil, types.ErrorCodeBadResponse, http.StatusInternalServerError)
-	}
-
-	statusCodeMappingStr := c.GetString("status_code_mapping")
-
-	httpResp = resp.(*http.Response)
-	info.IsStream = info.IsStream || strings.HasPrefix(httpResp.Header.Get("Content-Type"), "text/event-stream")
-	if httpResp.StatusCode != http.StatusOK {
-		newApiErr := service.RelayErrorHandler(c.Request.Context(), httpResp, false)
-		service.ResetStatusCode(newApiErr, statusCodeMappingStr)
-		return nil, newApiErr
-	}
-
-	if info.IsStream {
-		usage, newApiErr := openaichannel.OaiResponsesToChatStreamHandler(c, info, httpResp)
-		if newApiErr != nil {
-			service.ResetStatusCode(newApiErr, statusCodeMappingStr)
-			return nil, newApiErr
-		}
-		return usage, nil
-	}
-
-	usage, newApiErr := openaichannel.OaiResponsesToChatHandler(c, info, httpResp)
-	if newApiErr != nil {
-		service.ResetStatusCode(newApiErr, statusCodeMappingStr)
-		return nil, newApiErr
-	}
-	return usage, nil
-}
--- a/relay/claude_handler.go
+++ b/relay/claude_handler.go
@@ -110,7 +110,6 @@ func ClaudeHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
 		if err != nil {
 			return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
 		}
-		relaycommon.AppendRequestConversionFromRequest(info, convertedRequest)
 		jsonData, err := common.Marshal(convertedRequest)
 		if err != nil {
 			return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
--- a/relay/common/override.go
+++ b/relay/common/override.go
@@ -23,7 +23,7 @@ type ConditionOperation struct {

 type ParamOperation struct {
 	Path       string               `json:"path"`
-	Mode       string               `json:"mode"` // delete, set, move, copy, prepend, append, trim_prefix, trim_suffix, ensure_prefix, ensure_suffix, trim_space, to_lower, to_upper, replace, regex_replace
+	Mode       string               `json:"mode"` // delete, set, move, prepend, append
 	Value      interface{}          `json:"value"`
 	KeepOrigin bool                 `json:"keep_origin"`
 	From       string               `json:"from,omitempty"`
@@ -330,6 +330,8 @@ func applyOperations(jsonStr string, operations []ParamOperation, conditionConte
 		}
 		// 处理路径中的负数索引
 		opPath := processNegativeIndex(result, op.Path)
+		opFrom := processNegativeIndex(result, op.From)
+		opTo := processNegativeIndex(result, op.To)

 		switch op.Mode {
 		case "delete":
@@ -340,38 +342,11 @@ func applyOperations(jsonStr string, operations []ParamOperation, conditionConte
 			}
 			result, err = sjson.Set(result, opPath, op.Value)
 		case "move":
-			opFrom := processNegativeIndex(result, op.From)
-			opTo := processNegativeIndex(result, op.To)
 			result, err = moveValue(result, opFrom, opTo)
-		case "copy":
-			if op.From == "" || op.To == "" {
-				return "", fmt.Errorf("copy from/to is required")
-			}
-			opFrom := processNegativeIndex(result, op.From)
-			opTo := processNegativeIndex(result, op.To)
-			result, err = copyValue(result, opFrom, opTo)
 		case "prepend":
 			result, err = modifyValue(result, opPath, op.Value, op.KeepOrigin, true)
 		case "append":
 			result, err = modifyValue(result, opPath, op.Value, op.KeepOrigin, false)
-		case "trim_prefix":
-			result, err = trimStringValue(result, opPath, op.Value, true)
-		case "trim_suffix":
-			result, err = trimStringValue(result, opPath, op.Value, false)
-		case "ensure_prefix":
-			result, err = ensureStringAffix(result, opPath, op.Value, true)
-		case "ensure_suffix":
-			result, err = ensureStringAffix(result, opPath, op.Value, false)
-		case "trim_space":
-			result, err = transformStringValue(result, opPath, strings.TrimSpace)
-		case "to_lower":
-			result, err = transformStringValue(result, opPath, strings.ToLower)
-		case "to_upper":
-			result, err = transformStringValue(result, opPath, strings.ToUpper)
-		case "replace":
-			result, err = replaceStringValue(result, opPath, op.From, op.To)
-		case "regex_replace":
-			result, err = regexReplaceStringValue(result, opPath, op.From, op.To)
 		default:
 			return "", fmt.Errorf("unknown operation: %s", op.Mode)
 		}
@@ -394,14 +369,6 @@ func moveValue(jsonStr, fromPath, toPath string) (string, error) {
 	return sjson.Delete(result, fromPath)
 }

-func copyValue(jsonStr, fromPath, toPath string) (string, error) {
-	sourceValue := gjson.Get(jsonStr, fromPath)
-	if !sourceValue.Exists() {
-		return jsonStr, fmt.Errorf("source path does not exist: %s", fromPath)
-	}
-	return sjson.Set(jsonStr, toPath, sourceValue.Value())
-}
-
 func modifyValue(jsonStr, path string, value interface{}, keepOrigin, isPrepend bool) (string, error) {
 	current := gjson.Get(jsonStr, path)
 	switch {
@@ -455,88 +422,6 @@ func modifyString(jsonStr, path string, value interface{}, isPrepend bool) (stri
 	return sjson.Set(jsonStr, path, newStr)
 }

-func trimStringValue(jsonStr, path string, value interface{}, isPrefix bool) (string, error) {
-	current := gjson.Get(jsonStr, path)
-	if current.Type != gjson.String {
-		return jsonStr, fmt.Errorf("operation not supported for type: %v", current.Type)
-	}
-
-	if value == nil {
-		return jsonStr, fmt.Errorf("trim value is required")
-	}
-	valueStr := fmt.Sprintf("%v", value)
-
-	var newStr string
-	if isPrefix {
-		newStr = strings.TrimPrefix(current.String(), valueStr)
-	} else {
-		newStr = strings.TrimSuffix(current.String(), valueStr)
-	}
-	return sjson.Set(jsonStr, path, newStr)
-}
-
-func ensureStringAffix(jsonStr, path string, value interface{}, isPrefix bool) (string, error) {
-	current := gjson.Get(jsonStr, path)
-	if current.Type != gjson.String {
-		return jsonStr, fmt.Errorf("operation not supported for type: %v", current.Type)
-	}
-
-	if value == nil {
-		return jsonStr, fmt.Errorf("ensure value is required")
-	}
-	valueStr := fmt.Sprintf("%v", value)
-	if valueStr == "" {
-		return jsonStr, fmt.Errorf("ensure value is required")
-	}
-
-	currentStr := current.String()
-	if isPrefix {
-		if strings.HasPrefix(currentStr, valueStr) {
-			return jsonStr, nil
-		}
-		return sjson.Set(jsonStr, path, valueStr+currentStr)
-	}
-
-	if strings.HasSuffix(currentStr, valueStr) {
-		return jsonStr, nil
-	}
-	return sjson.Set(jsonStr, path, currentStr+valueStr)
-}
-
-func transformStringValue(jsonStr, path string, transform func(string) string) (string, error) {
-	current := gjson.Get(jsonStr, path)
-	if current.Type != gjson.String {
-		return jsonStr, fmt.Errorf("operation not supported for type: %v", current.Type)
-	}
-	return sjson.Set(jsonStr, path, transform(current.String()))
-}
-
-func replaceStringValue(jsonStr, path, from, to string) (string, error) {
-	current := gjson.Get(jsonStr, path)
-	if current.Type != gjson.String {
-		return jsonStr, fmt.Errorf("operation not supported for type: %v", current.Type)
-	}
-	if from == "" {
-		return jsonStr, fmt.Errorf("replace from is required")
-	}
-	return sjson.Set(jsonStr, path, strings.ReplaceAll(current.String(), from, to))
-}
-
-func regexReplaceStringValue(jsonStr, path, pattern, replacement string) (string, error) {
-	current := gjson.Get(jsonStr, path)
-	if current.Type != gjson.String {
-		return jsonStr, fmt.Errorf("operation not supported for type: %v", current.Type)
-	}
-	if pattern == "" {
-		return jsonStr, fmt.Errorf("regex pattern is required")
-	}
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		return jsonStr, err
-	}
-	return sjson.Set(jsonStr, path, re.ReplaceAllString(current.String(), replacement))
-}
-
 func mergeObjects(jsonStr, path string, value interface{}, keepOrigin bool) (string, error) {
 	current := gjson.Get(jsonStr, path)
 	var currentMap, newMap map[string]interface{}
@@ -570,19 +455,18 @@ func mergeObjects(jsonStr, path string, value interface{}, keepOrigin bool) (str

 // BuildParamOverrideContext 提供 ApplyParamOverride 可用的上下文信息。
 // 目前内置以下字段：
-//   - upstream_model/model：始终为通道映射后的上游模型名。
+//   - model：优先使用上游模型名（UpstreamModelName），若不存在则回落到原始模型名（OriginModelName）。
+//   - upstream_model：始终为通道映射后的上游模型名。
 //   - original_model：请求最初指定的模型名。
-//   - request_path：请求路径
-//   - is_channel_test：是否为渠道测试请求（同 is_test）。
 func BuildParamOverrideContext(info *RelayInfo) map[string]interface{} {
-	if info == nil {
+	if info == nil || info.ChannelMeta == nil {
 		return nil
 	}

 	ctx := make(map[string]interface{})
-	if info.ChannelMeta != nil && info.ChannelMeta.UpstreamModelName != "" {
-		ctx["model"] = info.ChannelMeta.UpstreamModelName
-		ctx["upstream_model"] = info.ChannelMeta.UpstreamModelName
+	if info.UpstreamModelName != "" {
+		ctx["model"] = info.UpstreamModelName
+		ctx["upstream_model"] = info.UpstreamModelName
 	}
 	if info.OriginModelName != "" {
 		ctx["original_model"] = info.OriginModelName
@@ -591,13 +475,8 @@ func BuildParamOverrideContext(info *RelayInfo) map[string]interface{} {
 		}
 	}

-	if info.RequestURLPath != "" {
-		requestPath := info.RequestURLPath
-		if requestPath != "" {
-			ctx["request_path"] = requestPath
-		}
+	if len(ctx) == 0 {
+		return nil
 	}
-
-	ctx["is_channel_test"] = info.IsChannelTest
 	return ctx
 }
--- a/relay/common/override_test.go
+++ b/relay/common/override_test.go
@@ -1,791 +0,0 @@
-package common
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-)
-
-func TestApplyParamOverrideTrimPrefix(t *testing.T) {
-	// trim_prefix example:
-	// {"operations":[{"path":"model","mode":"trim_prefix","value":"openai/"}]}
-	input := []byte(`{"model":"openai/gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "trim_prefix",
-				"value": "openai/",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideTrimSuffix(t *testing.T) {
-	// trim_suffix example:
-	// {"operations":[{"path":"model","mode":"trim_suffix","value":"-latest"}]}
-	input := []byte(`{"model":"gpt-4-latest","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "trim_suffix",
-				"value": "-latest",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideTrimNoop(t *testing.T) {
-	// trim_prefix no-op example:
-	// {"operations":[{"path":"model","mode":"trim_prefix","value":"openai/"}]}
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "trim_prefix",
-				"value": "openai/",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideTrimRequiresValue(t *testing.T) {
-	// trim_prefix requires value example:
-	// {"operations":[{"path":"model","mode":"trim_prefix"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "trim_prefix",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideReplace(t *testing.T) {
-	// replace example:
-	// {"operations":[{"path":"model","mode":"replace","from":"openai/","to":""}]}
-	input := []byte(`{"model":"openai/gpt-4o-mini","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "replace",
-				"from": "openai/",
-				"to":   "",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4o-mini","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideRegexReplace(t *testing.T) {
-	// regex_replace example:
-	// {"operations":[{"path":"model","mode":"regex_replace","from":"^gpt-","to":"openai/gpt-"}]}
-	input := []byte(`{"model":"gpt-4o-mini","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "regex_replace",
-				"from": "^gpt-",
-				"to":   "openai/gpt-",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"openai/gpt-4o-mini","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideReplaceRequiresFrom(t *testing.T) {
-	// replace requires from example:
-	// {"operations":[{"path":"model","mode":"replace"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "replace",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideRegexReplaceRequiresPattern(t *testing.T) {
-	// regex_replace requires from(pattern) example:
-	// {"operations":[{"path":"model","mode":"regex_replace"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "regex_replace",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideDelete(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "temperature",
-				"mode": "delete",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-
-	var got map[string]interface{}
-	if err := json.Unmarshal(out, &got); err != nil {
-		t.Fatalf("failed to unmarshal output JSON: %v", err)
-	}
-	if _, exists := got["temperature"]; exists {
-		t.Fatalf("expected temperature to be deleted")
-	}
-}
-
-func TestApplyParamOverrideSet(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.1}`, string(out))
-}
-
-func TestApplyParamOverrideSetKeepOrigin(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":        "temperature",
-				"mode":        "set",
-				"value":       0.1,
-				"keep_origin": true,
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideMove(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","meta":{"x":1}}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"mode": "move",
-				"from": "model",
-				"to":   "meta.model",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"meta":{"x":1,"model":"gpt-4"}}`, string(out))
-}
-
-func TestApplyParamOverrideMoveMissingSource(t *testing.T) {
-	input := []byte(`{"meta":{"x":1}}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"mode": "move",
-				"from": "model",
-				"to":   "meta.model",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverridePrependAppendString(t *testing.T) {
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "prepend",
-				"value": "openai/",
-			},
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "append",
-				"value": "-latest",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"openai/gpt-4-latest"}`, string(out))
-}
-
-func TestApplyParamOverridePrependAppendArray(t *testing.T) {
-	input := []byte(`{"arr":[1,2]}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "arr",
-				"mode":  "prepend",
-				"value": 0,
-			},
-			map[string]interface{}{
-				"path":  "arr",
-				"mode":  "append",
-				"value": []interface{}{3, 4},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"arr":[0,1,2,3,4]}`, string(out))
-}
-
-func TestApplyParamOverrideAppendObjectMergeKeepOrigin(t *testing.T) {
-	input := []byte(`{"obj":{"a":1}}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":        "obj",
-				"mode":        "append",
-				"keep_origin": true,
-				"value": map[string]interface{}{
-					"a": 2,
-					"b": 3,
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"obj":{"a":1,"b":3}}`, string(out))
-}
-
-func TestApplyParamOverrideAppendObjectMergeOverride(t *testing.T) {
-	input := []byte(`{"obj":{"a":1}}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "obj",
-				"mode": "append",
-				"value": map[string]interface{}{
-					"a": 2,
-					"b": 3,
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"obj":{"a":2,"b":3}}`, string(out))
-}
-
-func TestApplyParamOverrideConditionORDefault(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-				"conditions": []interface{}{
-					map[string]interface{}{
-						"path":  "model",
-						"mode":  "prefix",
-						"value": "gpt",
-					},
-					map[string]interface{}{
-						"path":  "model",
-						"mode":  "prefix",
-						"value": "claude",
-					},
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.1}`, string(out))
-}
-
-func TestApplyParamOverrideConditionAND(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-				"logic": "AND",
-				"conditions": []interface{}{
-					map[string]interface{}{
-						"path":  "model",
-						"mode":  "prefix",
-						"value": "gpt",
-					},
-					map[string]interface{}{
-						"path":  "temperature",
-						"mode":  "gt",
-						"value": 0.5,
-					},
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.1}`, string(out))
-}
-
-func TestApplyParamOverrideConditionInvert(t *testing.T) {
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-				"conditions": []interface{}{
-					map[string]interface{}{
-						"path":   "model",
-						"mode":   "prefix",
-						"value":  "gpt",
-						"invert": true,
-					},
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideConditionPassMissingKey(t *testing.T) {
-	input := []byte(`{"temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-				"conditions": []interface{}{
-					map[string]interface{}{
-						"path":             "model",
-						"mode":             "prefix",
-						"value":            "gpt",
-						"pass_missing_key": true,
-					},
-				},
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"temperature":0.1}`, string(out))
-}
-
-func TestApplyParamOverrideConditionFromContext(t *testing.T) {
-	input := []byte(`{"temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "temperature",
-				"mode":  "set",
-				"value": 0.1,
-				"conditions": []interface{}{
-					map[string]interface{}{
-						"path":  "model",
-						"mode":  "prefix",
-						"value": "gpt",
-					},
-				},
-			},
-		},
-	}
-	ctx := map[string]interface{}{
-		"model": "gpt-4",
-	}
-
-	out, err := ApplyParamOverride(input, override, ctx)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"temperature":0.1}`, string(out))
-}
-
-func TestApplyParamOverrideNegativeIndexPath(t *testing.T) {
-	input := []byte(`{"arr":[{"model":"a"},{"model":"b"}]}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "arr.-1.model",
-				"mode":  "set",
-				"value": "c",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"arr":[{"model":"a"},{"model":"c"}]}`, string(out))
-}
-
-func TestApplyParamOverrideRegexReplaceInvalidPattern(t *testing.T) {
-	// regex_replace invalid pattern example:
-	// {"operations":[{"path":"model","mode":"regex_replace","from":"(","to":"x"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "regex_replace",
-				"from": "(",
-				"to":   "x",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideCopy(t *testing.T) {
-	// copy example:
-	// {"operations":[{"mode":"copy","from":"model","to":"original_model"}]}
-	input := []byte(`{"model":"gpt-4","temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"mode": "copy",
-				"from": "model",
-				"to":   "original_model",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4","original_model":"gpt-4","temperature":0.7}`, string(out))
-}
-
-func TestApplyParamOverrideCopyMissingSource(t *testing.T) {
-	// copy missing source example:
-	// {"operations":[{"mode":"copy","from":"model","to":"original_model"}]}
-	input := []byte(`{"temperature":0.7}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"mode": "copy",
-				"from": "model",
-				"to":   "original_model",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideCopyRequiresFromTo(t *testing.T) {
-	// copy requires from/to example:
-	// {"operations":[{"mode":"copy"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"mode": "copy",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideEnsurePrefix(t *testing.T) {
-	// ensure_prefix example:
-	// {"operations":[{"path":"model","mode":"ensure_prefix","value":"openai/"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "ensure_prefix",
-				"value": "openai/",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"openai/gpt-4"}`, string(out))
-}
-
-func TestApplyParamOverrideEnsurePrefixNoop(t *testing.T) {
-	// ensure_prefix no-op example:
-	// {"operations":[{"path":"model","mode":"ensure_prefix","value":"openai/"}]}
-	input := []byte(`{"model":"openai/gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "ensure_prefix",
-				"value": "openai/",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"openai/gpt-4"}`, string(out))
-}
-
-func TestApplyParamOverrideEnsureSuffix(t *testing.T) {
-	// ensure_suffix example:
-	// {"operations":[{"path":"model","mode":"ensure_suffix","value":"-latest"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "ensure_suffix",
-				"value": "-latest",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4-latest"}`, string(out))
-}
-
-func TestApplyParamOverrideEnsureSuffixNoop(t *testing.T) {
-	// ensure_suffix no-op example:
-	// {"operations":[{"path":"model","mode":"ensure_suffix","value":"-latest"}]}
-	input := []byte(`{"model":"gpt-4-latest"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path":  "model",
-				"mode":  "ensure_suffix",
-				"value": "-latest",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4-latest"}`, string(out))
-}
-
-func TestApplyParamOverrideEnsureRequiresValue(t *testing.T) {
-	// ensure_prefix requires value example:
-	// {"operations":[{"path":"model","mode":"ensure_prefix"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "ensure_prefix",
-			},
-		},
-	}
-
-	_, err := ApplyParamOverride(input, override, nil)
-	if err == nil {
-		t.Fatalf("expected error, got nil")
-	}
-}
-
-func TestApplyParamOverrideTrimSpace(t *testing.T) {
-	// trim_space example:
-	// {"operations":[{"path":"model","mode":"trim_space"}]}
-	input := []byte("{\"model\":\"  gpt-4 \\n\"}")
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "trim_space",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4"}`, string(out))
-}
-
-func TestApplyParamOverrideToLower(t *testing.T) {
-	// to_lower example:
-	// {"operations":[{"path":"model","mode":"to_lower"}]}
-	input := []byte(`{"model":"GPT-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "to_lower",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"gpt-4"}`, string(out))
-}
-
-func TestApplyParamOverrideToUpper(t *testing.T) {
-	// to_upper example:
-	// {"operations":[{"path":"model","mode":"to_upper"}]}
-	input := []byte(`{"model":"gpt-4"}`)
-	override := map[string]interface{}{
-		"operations": []interface{}{
-			map[string]interface{}{
-				"path": "model",
-				"mode": "to_upper",
-			},
-		},
-	}
-
-	out, err := ApplyParamOverride(input, override, nil)
-	if err != nil {
-		t.Fatalf("ApplyParamOverride returned error: %v", err)
-	}
-	assertJSONEqual(t, `{"model":"GPT-4"}`, string(out))
-}
-
-func assertJSONEqual(t *testing.T, want, got string) {
-	t.Helper()
-
-	var wantObj interface{}
-	var gotObj interface{}
-
-	if err := json.Unmarshal([]byte(want), &wantObj); err != nil {
-		t.Fatalf("failed to unmarshal want JSON: %v", err)
-	}
-	if err := json.Unmarshal([]byte(got), &gotObj); err != nil {
-		t.Fatalf("failed to unmarshal got JSON: %v", err)
-	}
-
-	if !reflect.DeepEqual(wantObj, gotObj) {
-		t.Fatalf("json not equal\nwant: %s\ngot:  %s", want, got)
-	}
-}
--- a/relay/common/relay_info.go
+++ b/relay/common/relay_info.go
@@ -11,7 +11,6 @@ import (
 	"github.com/QuantumNous/new-api/constant"
 	"github.com/QuantumNous/new-api/dto"
 	relayconstant "github.com/QuantumNous/new-api/relay/constant"
-	"github.com/QuantumNous/new-api/setting/model_setting"
 	"github.com/QuantumNous/new-api/types"

 	"github.com/gin-gonic/gin"
@@ -115,16 +114,11 @@ type RelayInfo struct {
 	SendResponseCount      int
 	FinalPreConsumedQuota  int  // 最终预消耗的配额
 	IsClaudeBetaQuery      bool // /v1/messages?beta=true
-	IsChannelTest          bool // channel test request

 	PriceData types.PriceData

 	Request dto.Request

-	// RequestConversionChain records request format conversions in order, e.g.
-	// ["openai", "openai_responses"] or ["openai", "claude"].
-	RequestConversionChain []types.RelayFormat
-
 	ThinkingContentInfo
 	TokenCountMeta
 	*ClaudeConvertInfo
@@ -278,7 +272,6 @@ var streamSupportedChannels = map[int]bool{
 	constant.ChannelTypeZhipu_v4:   true,
 	constant.ChannelTypeAli:        true,
 	constant.ChannelTypeSubmodel:   true,
-	constant.ChannelTypeCodex:      true,
 }

 func GenRelayInfoWs(c *gin.Context, ws *websocket.Conn) *RelayInfo {
@@ -452,97 +445,38 @@ func genBaseRelayInfo(c *gin.Context, request dto.Request) *RelayInfo {
 }

 func GenRelayInfo(c *gin.Context, relayFormat types.RelayFormat, request dto.Request, ws *websocket.Conn) (*RelayInfo, error) {
-	var info *RelayInfo
-	var err error
 	switch relayFormat {
 	case types.RelayFormatOpenAI:
-		info = GenRelayInfoOpenAI(c, request)
+		return GenRelayInfoOpenAI(c, request), nil
 	case types.RelayFormatOpenAIAudio:
-		info = GenRelayInfoOpenAIAudio(c, request)
+		return GenRelayInfoOpenAIAudio(c, request), nil
 	case types.RelayFormatOpenAIImage:
-		info = GenRelayInfoImage(c, request)
+		return GenRelayInfoImage(c, request), nil
 	case types.RelayFormatOpenAIRealtime:
-		info = GenRelayInfoWs(c, ws)
+		return GenRelayInfoWs(c, ws), nil
 	case types.RelayFormatClaude:
-		info = GenRelayInfoClaude(c, request)
+		return GenRelayInfoClaude(c, request), nil
 	case types.RelayFormatRerank:
 		if request, ok := request.(*dto.RerankRequest); ok {
-			info = GenRelayInfoRerank(c, request)
-			break
+			return GenRelayInfoRerank(c, request), nil
 		}
-		err = errors.New("request is not a RerankRequest")
+		return nil, errors.New("request is not a RerankRequest")
 	case types.RelayFormatGemini:
-		info = GenRelayInfoGemini(c, request)
+		return GenRelayInfoGemini(c, request), nil
 	case types.RelayFormatEmbedding:
-		info = GenRelayInfoEmbedding(c, request)
+		return GenRelayInfoEmbedding(c, request), nil
 	case types.RelayFormatOpenAIResponses:
 		if request, ok := request.(*dto.OpenAIResponsesRequest); ok {
-			info = GenRelayInfoResponses(c, request)
-			break
+			return GenRelayInfoResponses(c, request), nil
 		}
-		err = errors.New("request is not a OpenAIResponsesRequest")
-	case types.RelayFormatOpenAIResponsesCompaction:
-		if request, ok := request.(*dto.OpenAIResponsesCompactionRequest); ok {
-			return GenRelayInfoResponsesCompaction(c, request), nil
-		}
-		return nil, errors.New("request is not a OpenAIResponsesCompactionRequest")
+		return nil, errors.New("request is not a OpenAIResponsesRequest")
 	case types.RelayFormatTask:
-		info = genBaseRelayInfo(c, nil)
+		return genBaseRelayInfo(c, nil), nil
 	case types.RelayFormatMjProxy:
-		info = genBaseRelayInfo(c, nil)
+		return genBaseRelayInfo(c, nil), nil
 	default:
-		err = errors.New("invalid relay format")
+		return nil, errors.New("invalid relay format")
 	}
-
-	if err != nil {
-		return nil, err
-	}
-	if info == nil {
-		return nil, errors.New("failed to build relay info")
-	}
-
-	info.InitRequestConversionChain()
-	return info, nil
-}
-
-func (info *RelayInfo) InitRequestConversionChain() {
-	if info == nil {
-		return
-	}
-	if len(info.RequestConversionChain) > 0 {
-		return
-	}
-	if info.RelayFormat == "" {
-		return
-	}
-	info.RequestConversionChain = []types.RelayFormat{info.RelayFormat}
-}
-
-func (info *RelayInfo) AppendRequestConversion(format types.RelayFormat) {
-	if info == nil {
-		return
-	}
-	if format == "" {
-		return
-	}
-	if len(info.RequestConversionChain) == 0 {
-		info.RequestConversionChain = []types.RelayFormat{format}
-		return
-	}
-	last := info.RequestConversionChain[len(info.RequestConversionChain)-1]
-	if last == format {
-		return
-	}
-	info.RequestConversionChain = append(info.RequestConversionChain, format)
-}
-
-func GenRelayInfoResponsesCompaction(c *gin.Context, request *dto.OpenAIResponsesCompactionRequest) *RelayInfo {
-	info := genBaseRelayInfo(c, request)
-	if info.RelayMode == relayconstant.RelayModeUnknown {
-		info.RelayMode = relayconstant.RelayModeResponsesCompact
-	}
-	info.RelayFormat = types.RelayFormatOpenAIResponsesCompaction
-	return info
 }

 //func (info *RelayInfo) SetPromptTokens(promptTokens int) {
@@ -700,47 +634,3 @@ func RemoveDisabledFields(jsonData []byte, channelOtherSettings dto.ChannelOther
 	}
 	return jsonDataAfter, nil
 }
-
-// RemoveGeminiDisabledFields removes disabled fields from Gemini request JSON data
-// Currently supports removing functionResponse.id field which Vertex AI does not support
-func RemoveGeminiDisabledFields(jsonData []byte) ([]byte, error) {
-	if !model_setting.GetGeminiSettings().RemoveFunctionResponseIdEnabled {
-		return jsonData, nil
-	}
-
-	var data map[string]interface{}
-	if err := common.Unmarshal(jsonData, &data); err != nil {
-		common.SysError("RemoveGeminiDisabledFields Unmarshal error: " + err.Error())
-		return jsonData, nil
-	}
-
-	// Process contents array
-	// Handle both camelCase (functionResponse) and snake_case (function_response)
-	if contents, ok := data["contents"].([]interface{}); ok {
-		for _, content := range contents {
-			if contentMap, ok := content.(map[string]interface{}); ok {
-				if parts, ok := contentMap["parts"].([]interface{}); ok {
-					for _, part := range parts {
-						if partMap, ok := part.(map[string]interface{}); ok {
-							// Check functionResponse (camelCase)
-							if funcResp, ok := partMap["functionResponse"].(map[string]interface{}); ok {
-								delete(funcResp, "id")
-							}
-							// Check function_response (snake_case)
-							if funcResp, ok := partMap["function_response"].(map[string]interface{}); ok {
-								delete(funcResp, "id")
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	jsonDataAfter, err := common.Marshal(data)
-	if err != nil {
-		common.SysError("RemoveGeminiDisabledFields Marshal error: " + err.Error())
-		return jsonData, nil
-	}
-	return jsonDataAfter, nil
-}
--- a/relay/common/request_conversion.go
+++ b/relay/common/request_conversion.go
@@ -1,40 +0,0 @@
-package common
-
-import (
-	"github.com/QuantumNous/new-api/dto"
-	"github.com/QuantumNous/new-api/types"
-)
-
-func GuessRelayFormatFromRequest(req any) (types.RelayFormat, bool) {
-	switch req.(type) {
-	case *dto.GeneralOpenAIRequest, dto.GeneralOpenAIRequest:
-		return types.RelayFormatOpenAI, true
-	case *dto.OpenAIResponsesRequest, dto.OpenAIResponsesRequest:
-		return types.RelayFormatOpenAIResponses, true
-	case *dto.ClaudeRequest, dto.ClaudeRequest:
-		return types.RelayFormatClaude, true
-	case *dto.GeminiChatRequest, dto.GeminiChatRequest:
-		return types.RelayFormatGemini, true
-	case *dto.EmbeddingRequest, dto.EmbeddingRequest:
-		return types.RelayFormatEmbedding, true
-	case *dto.RerankRequest, dto.RerankRequest:
-		return types.RelayFormatRerank, true
-	case *dto.ImageRequest, dto.ImageRequest:
-		return types.RelayFormatOpenAIImage, true
-	case *dto.AudioRequest, dto.AudioRequest:
-		return types.RelayFormatOpenAIAudio, true
-	default:
-		return "", false
-	}
-}
-
-func AppendRequestConversionFromRequest(info *RelayInfo, req any) {
-	if info == nil {
-		return
-	}
-	format, ok := GuessRelayFormatFromRequest(req)
-	if !ok {
-		return
-	}
-	info.AppendRequestConversion(format)
-}
--- a/Show More
+++ b/Show More