update WhichModel enum
This commit is contained in:
jhqxxx
+3
-143
@@ -22,8 +22,9 @@ pub mod rmbg2_0;
|
||||
pub mod voxcpm;
|
||||
pub mod w2v_bert_2_0;
|
||||
|
||||
use crate::params::chat::{
|
||||
ChatCompletionChunkResponse, ChatCompletionParameters, ChatCompletionResponse,
|
||||
use crate::{
|
||||
models::common::model_mapping::WhichModel,
|
||||
params::chat::{ChatCompletionChunkResponse, ChatCompletionParameters, ChatCompletionResponse},
|
||||
};
|
||||
use anyhow::{Result, anyhow};
|
||||
use rocket::futures::Stream;
|
||||
@@ -40,147 +41,6 @@ use crate::models::{
|
||||
rmbg2_0::generate::RMBG2_0Model, voxcpm::generate::VoxCPMGenerate,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, clap::ValueEnum)]
|
||||
pub enum WhichModel {
|
||||
#[value(name = "lfm2-1.2b")]
|
||||
LFM2_1_2B,
|
||||
#[value(name = "lfm2.5-1.2b-instruct")]
|
||||
LFM2_5_1_2BInstruct,
|
||||
#[value(name = "lfm2.5-vl-1.6b")]
|
||||
LFM2_5VL1_6B,
|
||||
#[value(name = "lfm2-vl-1.6b")]
|
||||
LFM2VL1_6B,
|
||||
#[value(name = "minicpm4-0.5b")]
|
||||
MiniCPM4_0_5B,
|
||||
#[value(name = "qwen2.5vl-3b")]
|
||||
Qwen2_5VL3B,
|
||||
#[value(name = "qwen2.5vl-7b")]
|
||||
Qwen2_5VL7B,
|
||||
#[value(name = "qwen3-0.6b")]
|
||||
Qwen3_0_6B,
|
||||
#[value(name = "qwen3.5-0.8b")]
|
||||
Qwen3_5_0_8B,
|
||||
#[value(name = "qwen3.5-2b")]
|
||||
Qwen3_5_2B,
|
||||
#[value(name = "qwen3.5-4b")]
|
||||
Qwen3_5_4B,
|
||||
#[value(name = "qwen3.5-9b")]
|
||||
Qwen3_5_9B,
|
||||
#[value(name = "qwen3.5-gguf")]
|
||||
Qwen3_5Gguf,
|
||||
#[value(name = "qwen3asr-0.6b")]
|
||||
Qwen3ASR0_6B,
|
||||
#[value(name = "qwen3asr-1.7b")]
|
||||
Qwen3ASR1_7B,
|
||||
#[value(name = "qwen3vl-2b")]
|
||||
Qwen3VL2B,
|
||||
#[value(name = "qwen3vl-4b")]
|
||||
Qwen3VL4B,
|
||||
#[value(name = "qwen3vl-8b")]
|
||||
Qwen3VL8B,
|
||||
#[value(name = "qwen3vl-32b")]
|
||||
Qwen3VL32B,
|
||||
#[value(name = "deepseek-ocr")]
|
||||
DeepSeekOCR,
|
||||
#[value(name = "deepseek-ocr2")]
|
||||
DeepSeekOCR2,
|
||||
#[value(name = "hunyuan-ocr")]
|
||||
HunyuanOCR,
|
||||
#[value(name = "paddleocr-vl")]
|
||||
PaddleOCRVL,
|
||||
#[value(name = "paddleocr-vl1.5")]
|
||||
PaddleOCRVL1_5,
|
||||
#[value(name = "rmbg2.0")]
|
||||
RMBG2_0,
|
||||
#[value(name = "voxcpm")]
|
||||
VoxCPM,
|
||||
#[value(name = "voxcpm1.5")]
|
||||
VoxCPM1_5,
|
||||
#[value(name = "glm-asr-nano-2512")]
|
||||
GlmASRNano2512,
|
||||
#[value(name = "fun-asr-nano-2512")]
|
||||
FunASRNano2512,
|
||||
#[value(name = "glm-ocr")]
|
||||
GlmOCR,
|
||||
}
|
||||
|
||||
impl WhichModel {
|
||||
/// Get the ModelScope model ID for this model variant
|
||||
pub fn model_id(self) -> &'static str {
|
||||
match self {
|
||||
WhichModel::LFM2_1_2B => "LiquidAI/LFM2-1.2B",
|
||||
WhichModel::LFM2_5_1_2BInstruct => "LiquidAI/LFM2.5-1.2B-Instruct",
|
||||
WhichModel::LFM2_5VL1_6B => "LiquidAI/LFM2.5-VL-1.6B",
|
||||
WhichModel::LFM2VL1_6B => "LiquidAI/LFM2-VL-1.6B",
|
||||
WhichModel::MiniCPM4_0_5B => "OpenBMB/MiniCPM4-0.5B",
|
||||
WhichModel::Qwen2_5VL3B => "Qwen/Qwen2.5-VL-3B-Instruct",
|
||||
WhichModel::Qwen2_5VL7B => "Qwen/Qwen2.5-VL-7B-Instruct",
|
||||
WhichModel::Qwen3_0_6B => "Qwen/Qwen3-0.6B",
|
||||
WhichModel::Qwen3_5_0_8B => "Qwen/Qwen3.5-0.8B",
|
||||
WhichModel::Qwen3_5_2B => "Qwen/Qwen3.5-2B",
|
||||
WhichModel::Qwen3_5_4B => "Qwen/Qwen3.5-4B",
|
||||
WhichModel::Qwen3_5_9B => "Qwen/Qwen3.5-9B",
|
||||
WhichModel::Qwen3_5Gguf => "GGUF",
|
||||
WhichModel::Qwen3ASR0_6B => "Qwen/Qwen3-ASR-0.6B",
|
||||
WhichModel::Qwen3ASR1_7B => "Qwen/Qwen3-ASR-1.7B",
|
||||
WhichModel::Qwen3VL2B => "Qwen/Qwen3-VL-2B-Instruct",
|
||||
WhichModel::Qwen3VL4B => "Qwen/Qwen3-VL-4B-Instruct",
|
||||
WhichModel::Qwen3VL8B => "Qwen/Qwen3-VL-8B-Instruct",
|
||||
WhichModel::Qwen3VL32B => "Qwen/Qwen3-VL-32B-Instruct",
|
||||
WhichModel::DeepSeekOCR => "deepseek-ai/DeepSeek-OCR",
|
||||
WhichModel::DeepSeekOCR2 => "deepseek-ai/DeepSeek-OCR-2",
|
||||
WhichModel::HunyuanOCR => "Tencent-Hunyuan/HunyuanOCR",
|
||||
WhichModel::PaddleOCRVL => "PaddlePaddle/PaddleOCR-VL",
|
||||
WhichModel::PaddleOCRVL1_5 => "PaddlePaddle/PaddleOCR-VL-1.5",
|
||||
WhichModel::RMBG2_0 => "AI-ModelScope/RMBG-2.0",
|
||||
WhichModel::VoxCPM => "OpenBMB/VoxCPM-0.5B",
|
||||
WhichModel::VoxCPM1_5 => "OpenBMB/VoxCPM1.5",
|
||||
WhichModel::GlmASRNano2512 => "ZhipuAI/GLM-ASR-Nano-2512",
|
||||
WhichModel::FunASRNano2512 => "FunAudioLLM/Fun-ASR-Nano-2512",
|
||||
WhichModel::GlmOCR => "ZhipuAI/GLM-OCR",
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the model type category for this model variant
|
||||
pub fn model_type(self) -> &'static str {
|
||||
match self {
|
||||
// LLM models
|
||||
WhichModel::MiniCPM4_0_5B
|
||||
| WhichModel::Qwen3_0_6B
|
||||
| WhichModel::LFM2_1_2B
|
||||
| WhichModel::LFM2_5_1_2BInstruct => "llm",
|
||||
WhichModel::Qwen2_5VL3B
|
||||
| WhichModel::Qwen2_5VL7B
|
||||
| WhichModel::Qwen3VL2B
|
||||
| WhichModel::Qwen3VL4B
|
||||
| WhichModel::Qwen3VL8B
|
||||
| WhichModel::Qwen3VL32B
|
||||
| WhichModel::Qwen3_5_0_8B
|
||||
| WhichModel::Qwen3_5_2B
|
||||
| WhichModel::Qwen3_5_4B
|
||||
| WhichModel::Qwen3_5_9B
|
||||
| WhichModel::Qwen3_5Gguf
|
||||
| WhichModel::LFM2_5VL1_6B
|
||||
| WhichModel::LFM2VL1_6B => "vlm",
|
||||
// OCR models
|
||||
WhichModel::DeepSeekOCR
|
||||
| WhichModel::DeepSeekOCR2
|
||||
| WhichModel::HunyuanOCR
|
||||
| WhichModel::GlmOCR
|
||||
| WhichModel::PaddleOCRVL
|
||||
| WhichModel::PaddleOCRVL1_5 => "ocr",
|
||||
// ASR models
|
||||
WhichModel::Qwen3ASR0_6B
|
||||
| WhichModel::Qwen3ASR1_7B
|
||||
| WhichModel::GlmASRNano2512
|
||||
| WhichModel::FunASRNano2512 => "asr",
|
||||
// Image models
|
||||
WhichModel::RMBG2_0 => "image",
|
||||
WhichModel::VoxCPM | WhichModel::VoxCPM1_5 => "tts",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub trait GenerateModel {
|
||||
fn generate(&mut self, mes: ChatCompletionParameters) -> Result<ChatCompletionResponse>;
|
||||
fn generate_stream(
|
||||
|
||||
Reference in New Issue
Block a user