本地模型参数修改（未测试）
This commit is contained in:
Wenjie Zhang
parent
6854a7812f
commit
bd679f47d6
@ -15,11 +15,7 @@ GLOBAL_EMBED_STATE = {}
|
||||
class EmbeddingModel(FlagModel):
|
||||
def __init__(self, model_info, config, **kwargs):
|
||||
self.info = model_info
|
||||
model_name_or_path = handle_local_model(
|
||||
paths=config.model_local_paths,
|
||||
model_name=model_info["name"],
|
||||
default_path=model_info.get("default_path", None))
|
||||
|
||||
model_name_or_path = config.model_local_paths.get(model_info["name"], model_info.get("default_path", None))
|
||||
logger.info(f"Loading embedding model {model_info['name']} from {model_name_or_path}")
|
||||
|
||||
super().__init__(model_name_or_path,
|
||||
@ -34,11 +30,7 @@ class Reranker(FlagReranker):
|
||||
|
||||
assert config.reranker in RERANKER_LIST.keys(), f"Unsupported Reranker: {config.reranker}, only support {RERANKER_LIST.keys()}"
|
||||
|
||||
model_name_or_path = handle_local_model(
|
||||
paths=config.model_local_paths,
|
||||
model_name=config.reranker,
|
||||
default_path=RERANKER_LIST[config.reranker])
|
||||
|
||||
model_name_or_path = config.model_local_paths.get(config.reranker, default_path=RERANKER_LIST[config.reranker])
|
||||
logger.info(f"Loading Reranker model {config.reranker} from {model_name_or_path}")
|
||||
|
||||
super().__init__(model_name_or_path, use_fp16=True, **kwargs)
|
||||
@ -113,6 +105,4 @@ def get_embedding_model(config):
|
||||
|
||||
def handle_local_model(paths, model_name, default_path):
|
||||
model_path = paths.get(model_name, default_path)
|
||||
if os.getenv("MODEL_ROOT_DIR") and not os.path.isabs(model_path):
|
||||
model_path = os.path.join(os.getenv("MODEL_ROOT_DIR"), model_path)
|
||||
return model_path
|
||||
@ -16,8 +16,6 @@ logger = setup_logger("OneKE")
|
||||
|
||||
dotenv.load_dotenv()
|
||||
|
||||
MODEL_NAME_OR_PATH = os.path.join(os.getenv('MODEL_ROOT_DIR', './'), 'OneKE')
|
||||
|
||||
instruction_mapper = {
|
||||
'NERzh': "你是专门进行实体抽取的专家。请从input中抽取出符合schema定义的实体，不存在的实体类型返回空列表。请按照JSON字符串的格式回答。",
|
||||
'REzh': "你是专门进行关系抽取的专家。请从input中抽取出符合schema定义的关系三元组。请按照JSON字符串的格式回答。",
|
||||
@ -42,7 +40,7 @@ class OneKE:
|
||||
def __init__(self, config=None):
|
||||
|
||||
self.config = config
|
||||
model_name_or_path = config.model_local_paths.get('oneke', "zjunlp/OneKE")
|
||||
model_name_or_path = config.model_local_paths.get('zjunlp/OneKE', "zjunlp/OneKE")
|
||||
logger.info(f"Loading KGC model OneKE from {model_name_or_path}")
|
||||
|
||||
model_config = AutoConfig.from_pretrained(model_name_or_path, trust_remote_code=True)
|
||||
|
||||
202
web/src/components/TableConfigComponent.vue
Normal file
202
web/src/components/TableConfigComponent.vue
Normal file
@ -0,0 +1,202 @@
|
||||
<template>
|
||||
<a-card class="config-card" style="max-width: 960px">
|
||||
<a-form layout="vertical">
|
||||
<div
|
||||
v-for="(item, index) in configList"
|
||||
:key="index"
|
||||
class="config-item"
|
||||
>
|
||||
<a-row :gutter="[16, 8]" align="middle">
|
||||
<a-col :span="8">
|
||||
<a-input
|
||||
v-model:value="item.key"
|
||||
placeholder="模型名称"
|
||||
readonly
|
||||
class="key-input"
|
||||
/>
|
||||
</a-col>
|
||||
<a-col :span="14">
|
||||
<a-input
|
||||
v-model:value="item.value"
|
||||
@change="updateValue(index)"
|
||||
placeholder="模型本地路径"
|
||||
class="value-input"
|
||||
/>
|
||||
</a-col>
|
||||
<a-col :span="2" class="delete-btn-col">
|
||||
<a-button
|
||||
type="link"
|
||||
danger
|
||||
class="delete-btn"
|
||||
@click="deleteConfig(index)"
|
||||
>
|
||||
<DeleteOutlined />
|
||||
</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</div>
|
||||
|
||||
<a-button block @click="addConfig" class="add-btn" :disabled="isAdding">
|
||||
<PlusOutlined /> 添加路径映射
|
||||
</a-button>
|
||||
</a-form>
|
||||
|
||||
<a-modal
|
||||
title="添加路径映射"
|
||||
v-model:visible="addConfigModalVisible"
|
||||
@ok="confirmAddConfig"
|
||||
class="config-modal"
|
||||
>
|
||||
<a-form layout="vertical">
|
||||
<a-form-item label="模型名称（与Huggingface名称一致，比如 BAAI/bge-large-zh-v1.5" required>
|
||||
<a-input
|
||||
v-model:value="newConfig.key"
|
||||
placeholder="请输入模型名称"
|
||||
class="modal-input"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="模型本地路径（绝对路径，比如 /hdd/models/BAAI/bge-large-zh-v1.5）" required>
|
||||
<a-input
|
||||
v-model:value="newConfig.value"
|
||||
placeholder="请输入模型本地路径"
|
||||
class="modal-input"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
</a-modal>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, computed, watch } from 'vue';
|
||||
import { message } from 'ant-design-vue';
|
||||
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
|
||||
|
||||
const props = defineProps({
|
||||
config: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['update:config']);
|
||||
|
||||
// 配置列表
|
||||
const configList = reactive([]);
|
||||
|
||||
// 初始化配置列表
|
||||
props.config && Object.entries(props.config).forEach(([key, value]) => {
|
||||
configList.push({ key, value });
|
||||
});
|
||||
|
||||
// 控制模态框显示
|
||||
const addConfigModalVisible = ref(false);
|
||||
|
||||
// 新增配置项数据
|
||||
const newConfig = ref({ key: '', value: '' });
|
||||
|
||||
// 添加配置
|
||||
const addConfig = () => {
|
||||
addConfigModalVisible.value = true;
|
||||
};
|
||||
|
||||
// 确认添加配置
|
||||
const confirmAddConfig = () => {
|
||||
if (newConfig.value.key === '' || newConfig.value.value === '') {
|
||||
message.warning('键或值不能为空');
|
||||
return;
|
||||
}
|
||||
if (configList.some(item => item.key === newConfig.value.key)) {
|
||||
message.warning('键已存在');
|
||||
return;
|
||||
}
|
||||
configList.push({ key: newConfig.value.key, value: newConfig.value.value });
|
||||
addConfigModalVisible.value = false;
|
||||
newConfig.value = { key: '', value: '' };
|
||||
};
|
||||
|
||||
// 删除配置
|
||||
const deleteConfig = (index) => {
|
||||
configList.splice(index, 1);
|
||||
};
|
||||
|
||||
// 更新值
|
||||
const updateValue = (index) => {
|
||||
// 值的更新实时反映在 configList 中，无需额外处理
|
||||
};
|
||||
|
||||
// 将配置列表转换为对象
|
||||
const configObject = computed(() => {
|
||||
return configList.reduce((acc, item) => {
|
||||
acc[item.key] = item.value;
|
||||
return acc;
|
||||
}, {});
|
||||
});
|
||||
|
||||
// 监听配置变化并传递回父组件
|
||||
watch(configObject, (newValue) => {
|
||||
emit('update:config', newValue);
|
||||
}, { deep: true });
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.config-card {
|
||||
background-color: var(--gray-10);
|
||||
border-radius: 8px;
|
||||
border: 1px solid var(--gray-300);
|
||||
}
|
||||
|
||||
.config-item {
|
||||
border-bottom: 1px solid #f0f0f0;
|
||||
padding: 12px 0;
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
|
||||
.config-item:hover {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
.config-item:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.key-input {
|
||||
background-color: #f8f8f8;
|
||||
border-color: #e8e8e8;
|
||||
}
|
||||
|
||||
.delete-btn-col {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.delete-btn {
|
||||
opacity: 0.6;
|
||||
transition: opacity 0.3s ease;
|
||||
}
|
||||
|
||||
.delete-btn:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.add-btn {
|
||||
margin-top: 16px;
|
||||
height: 40px;
|
||||
transition: all 0.3s ease;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.modal-input {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
:deep(.ant-modal-content) {
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
:deep(.ant-card-body) {
|
||||
padding: 16px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -185,7 +185,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting" v-if="state.section ==='path'">
|
||||
<h3>暂无配置</h3>
|
||||
<h3>本地模型配置</h3>
|
||||
<TableConfigComponent
|
||||
:config="configStore.config?.model_local_paths"
|
||||
@update:config="handleModelLocalPathsUpdate"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -206,6 +210,7 @@ import {
|
||||
InfoCircleOutlined,
|
||||
} from '@ant-design/icons-vue';
|
||||
import HeaderComponent from '@/components/HeaderComponent.vue';
|
||||
import TableConfigComponent from '@/components/TableConfigComponent.vue';
|
||||
import { notification, Button } from 'ant-design-vue';
|
||||
|
||||
const configStore = useConfigStore()
|
||||
@ -246,6 +251,10 @@ const generateRandomHash = (length) => {
|
||||
return hash;
|
||||
}
|
||||
|
||||
const handleModelLocalPathsUpdate = (config) => {
|
||||
handleChange('model_local_paths', config)
|
||||
}
|
||||
|
||||
const handleChange = (key, e) => {
|
||||
if (key == 'enable_knowledge_graph' && e && !configStore.config.enable_knowledge_base) {
|
||||
message.error('启动知识图谱必须请先启用知识库功能')
|
||||
@ -264,7 +273,8 @@ const handleChange = (key, e) => {
|
||||
|| key == 'model_provider'
|
||||
|| key == 'model_name'
|
||||
|| key == 'embed_model'
|
||||
|| key == 'reranker') {
|
||||
|| key == 'reranker'
|
||||
|| key == 'model_local_paths') {
|
||||
if (!isNeedRestart.value) {
|
||||
isNeedRestart.value = true
|
||||
notification.info({
|
||||
|
||||
Loading…
Reference in New Issue
Block a user