remove redundant code when constructing model names

This commit is contained in:
jeromeku 2025-03-31 15:06:08 -07:00
commit e734f3504f
6 changed files with 19 additions and 45 deletions

View file

@ -10,9 +10,7 @@ class DeepseekV3ModelInfo(ModelInfo):
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-V{version}"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
class DeepseekR1ModelInfo(ModelInfo):
@classmethod
@ -20,9 +18,7 @@ class DeepseekR1ModelInfo(ModelInfo):
key = f"{base_name}-{version}" if version else base_name
if size:
key = f"{key}-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
# Deepseek V3 Model Meta
DeepseekV3Meta = ModelMeta(

View file

@ -6,9 +6,7 @@ class GemmaModelInfo(ModelInfo):
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{version}-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
# Gemma3 Base Model Meta
GemmaMeta3Base = ModelMeta(

View file

@ -8,18 +8,14 @@ class LlamaModelInfo(ModelInfo):
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{version}-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
class LlamaVisionModelInfo(ModelInfo):
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{version}-{size}B-Vision"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
# Llama 3.1

View file

@ -7,9 +7,7 @@ class PhiModelInfo(ModelInfo):
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{version}"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
# Phi Model Meta
PhiMeta = ModelMeta(

View file

@ -5,44 +5,28 @@ _IS_QWEN_VL_REGISTERED = False
_IS_QWEN_QWQ_REGISTERED = False
class QwenModelInfo(ModelInfo):
@classmethod
def construct_model_name(
cls, base_name, version, size, quant_type, instruct_tag
):
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}{version}-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
class QwenVLModelInfo(ModelInfo):
@classmethod
def construct_model_name(
cls, base_name, version, size, quant_type, instruct_tag
):
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}{version}-VL-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
class QwenQwQModelInfo(ModelInfo):
@classmethod
def construct_model_name(
cls, base_name, version, size, quant_type, instruct_tag
):
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{size}B"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
class QwenQVQPreviewModelInfo(ModelInfo):
@classmethod
def construct_model_name(
cls, base_name, version, size, quant_type, instruct_tag
):
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
key = f"{base_name}-{size}B-Preview"
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
return super().construct_model_name(base_name, version, size, quant_type, instruct_tag, key)
# Qwen2.5 Model Meta
QwenMeta = ModelMeta(

View file

@ -36,7 +36,7 @@ class ModelInfo:
instruct_tag: str = None
quant_type: QuantType = None
description: str = None
def __post_init__(self):
self.name = self.name or self.construct_model_name(
self.base_name,
@ -61,8 +61,10 @@ class ModelInfo:
return key
@classmethod
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag):
raise NotImplementedError("Subclass must implement this method")
def construct_model_name(cls, base_name, version, size, quant_type, instruct_tag, key=""):
key = cls.append_instruct_tag(key, instruct_tag)
key = cls.append_quant_type(key, quant_type)
return key
@property
def model_path(