Skip to content

L
lmp_server
Commit 9bb9fa01 authored by linpeiqin's avatar linpeiqin
Browse files
Options

修改知识库相关

parent 5a8c60af
Hide whitespace changes
Inline Side-by-side
Showing with 7062 additions and 34 deletions
application-webadmin/src/main/java/com/yice/webadmin/app/controller/KnowledgeManageController.java
View file @ 9bb9fa01
package com.yice.webadmin.app.controller;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONException;
......@@ -57,13 +58,14 @@ public class KnowledgeManageController {
@ApiOperationSupport(ignoreParameters = {"knowledgeManageDto.knowledgeId", "knowledgeManageDto.searchString"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult<String> add(@MyRequestBody KnowledgeManageDto knowledgeManageDto) {
public ResponseResult<KnowledgeManage> add(@MyRequestBody KnowledgeManageDto knowledgeManageDto) {
String errorMessage = MyCommonUtil.getModelValidationError(knowledgeManageDto, false);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
KnowledgeManage knowledgeManage = MyModelUtil.copyTo(knowledgeManageDto, KnowledgeManage.class);
String requestBody = "{\n" + " \"knowledge_base_name\": \"" + knowledgeManage.getKnowledgeName() + "\",\n" + " \"vector_store_type\": \"faiss\",\n" + " \"embed_model\": \"m3e-base\"\n" + "}";
knowledgeManage.setKnowledgeCode(PinyinUtil.getPinyin(knowledgeManage.getKnowledgeName()).replace(" ","_"));
String requestBody = "{\n" + " \"knowledge_base_name\": \"" + knowledgeManage.getKnowledgeCode() + "\",\n" + " \"vector_store_type\": \"faiss\",\n" + " \"embed_model\": \"m3e-base\"\n" + "}";
try {
String result = proxyPythonService.predictPost(knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getCreate(), requestBody);
JSONObject jo = JSON.parseObject(result);
......@@ -71,10 +73,10 @@ public class KnowledgeManageController {
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
knowledgeManageService.saveNew(knowledgeManage);
return ResponseResult.success(data);
KnowledgeManage reKnowledgeManage = knowledgeManageService.saveNew(knowledgeManage);
return ResponseResult.success(reKnowledgeManage);
} else {
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, null);
}
} catch (IOException e) {
throw new RuntimeException(e);
......@@ -90,7 +92,7 @@ public class KnowledgeManageController {
@ApiOperationSupport(ignoreParameters = {"knowledgeManageDto.searchString"})
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult<Void> update(@MyRequestBody KnowledgeManageDto knowledgeManageDto) {
public ResponseResult<KnowledgeManage> update(@MyRequestBody KnowledgeManageDto knowledgeManageDto) {
String errorMessage = MyCommonUtil.getModelValidationError(knowledgeManageDto, true);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
......@@ -105,7 +107,7 @@ public class KnowledgeManageController {
if (!knowledgeManageService.update(knowledgeManage, originalKnowledgeManage)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
return ResponseResult.success();
return ResponseResult.success(originalKnowledgeManage);
}
/**
......@@ -304,7 +306,7 @@ public class KnowledgeManageController {
if (code != null && code == 200) {
for (KnowledgeManage knowledgeManage : knowledgeManageList) {
for (Object jsonObject : jsonArray) {
if (knowledgeManage.getKnowledgeName().equals(String.valueOf(jsonObject))) {
if (knowledgeManage.getKnowledgeCode().equals(String.valueOf(jsonObject))) {
reKnowledgeManageList.add(knowledgeManage);
}
}
......@@ -335,7 +337,7 @@ public class KnowledgeManageController {
if (code != null && code == 200) {
for (KnowledgeManage knowledgeManage : knowledgeManageList) {
for (Object jsonObject : jsonArray) {
if (knowledgeManage.getKnowledgeName().equals(String.valueOf(jsonObject))) {
if (knowledgeManage.getKnowledgeCode().equals(String.valueOf(jsonObject))) {
reKnowledgeManageList.add(knowledgeManage);
}
}
......@@ -408,6 +410,6 @@ public class KnowledgeManageController {
errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
}
return this.doDeleteByName(originalKnowledgeManage.getKnowledgeName());
return this.doDeleteByName(originalKnowledgeManage.getKnowledgeCode());
}
}
application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelVersionController.java
View file @ 9bb9fa01
......@@ -174,7 +174,7 @@ public class ModelVersionController {
*/
@PostMapping("/listModels")
public ResponseResult<JSONArray> listModels() throws IOException {
String url = this.pythonConfig.getChatAddress() + "llm_model/list_models";
String url = this.pythonConfig.getChatAddress() + "llm_model/list_running_models";
String result = proxyPythonService.predictPost(url, "");
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
......
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/KnowledgeManageMapper.xml
View file @ 9bb9fa01
......@@ -8,6 +8,7 @@
<result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="knowledge_name" jdbcType="VARCHAR" property="knowledgeName"/>
<result column="knowledge_code" jdbcType="VARCHAR" property="knowledgeCode"/>
<result column="knowledge_describe" jdbcType="VARCHAR" property="knowledgeDescribe"/>
</resultMap>
......@@ -19,6 +20,7 @@
update_user_id,
update_time,
knowledge_name,
knowledge_code,
knowledge_describe)
VALUES
<foreach collection="list" index="index" item="item" separator=",">
......@@ -28,6 +30,7 @@
#{item.updateUserId},
#{item.updateTime},
#{item.knowledgeName},
#{item.knowledgeCode},
#{item.knowledgeDescribe})
</foreach>
</insert>
......
application-webadmin/src/main/java/com/yice/webadmin/app/dto/KnowledgeManageDto.java
View file @ 9bb9fa01
......@@ -38,6 +38,12 @@ public class KnowledgeManageDto {
@ApiModelProperty(value = "知识库描述")
private String knowledgeDescribe;
/**
* 知识库编码。
*/
@ApiModelProperty(value = "知识库编码")
private String knowledgeCode;
/**
* knowledge_name LIKE搜索字符串。
*/
......
application-webadmin/src/main/java/com/yice/webadmin/app/model/KnowledgeManage.java
View file @ 9bb9fa01
......@@ -38,6 +38,11 @@ public class KnowledgeManage extends BaseModel {
*/
private String knowledgeName;
/**
* 知识库编码。
*/
private String knowledgeCode;
/**
* 知识库描述。
*/
......
application-webadmin/src/main/java/com/yice/webadmin/app/vo/KnowledgeManageVo.java
View file @ 9bb9fa01
......@@ -37,6 +37,12 @@ public class KnowledgeManageVo extends BaseVo {
@ApiModelProperty(value = "知识库描述")
private String knowledgeDescribe;
/**
* 知识库编码。
*/
@ApiModelProperty(value = "知识库编码")
private String knowledgeCode;
/**
* 创建人名称。
*/
......
application-webadmin/src/main/resources/application-dev.yml
View file @ 9bb9fa01
......@@ -4,14 +4,14 @@ spring:
druid:
# 数据库链接 [主数据源]
main:
url: jdbc:mysql://192.168.0.35:3306/lmp?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
username: yice
password: Yice@2021
url: jdbc:mysql://127.0.0.1:3306/lmp?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
username: root
password: a327327
# 默认生成的操作日志数据源配置。
operation-log:
url: jdbc:mysql://192.168.0.35:3306/lmp?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
username: yice
password: Yice@2021
url: jdbc:mysql://127.0.0.1:3306/lmp?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
username: root
password: a327327
driverClassName: com.mysql.cj.jdbc.Driver
name: application-webadmin
initialSize: 10
......@@ -62,29 +62,29 @@ application:
python:
#数据集文件基础路径
datasetFileBaseDir: /home/linking/llms/code/LLaMA-Factory-0.3.2/lmp_data/
datasetFileBaseDir: C:\Users\Lenovo\lmp-chat\factory\lmp-factory\lmp_data\
#模型训练文件基础路径
modelTuningFileBaseDir: /home/linking/llms/code/LLaMA-Factory-0.3.2/saves/
modelTuningFileBaseDir: C:\Users\Lenovo\lmp-chat\factory\lmp-factory\saves\
#模型训练文件合并后路径
modelOutputFileBaseDir: /home/linking/llms/models/
modelOutputFileBaseDir: C:\Users\Lenovo\lmp-chat\models\
#模型评估文件基础路径
modelEstimateFileBaseDir: /home/linking/llms/code/LLaMA-Factory-0.3.2/saves/
modelEstimateFileBaseDir: C:\Users\Lenovo\lmp-chat\factory\lmp-factory\saves\
#数据集配置信息
datasetInfo: dataset_info.json
#数据集配置目录
datasetFileMenu: lmp_data
#python平台通用接口地址
factoryInterface: http://192.168.0.36:7860/run/predict
factoryInterface: http://127.0.0.1:7860/run/predict
#python websocket 服务地址
pythonWebsocketUri: ws://192.168.0.36:7860/queue/join
pythonWebsocketUri: ws://127.0.0.1:7860/queue/join
#输出控制地址
controllerAddress: http://0.0.0.0:20001
#对话基础路径
chatAddress: http://192.168.0.36:8000/
chatAddress: http://127.0.0.1:8000/
knowledge:
#知识库通用接口地址
knowledgeInterface: http://192.168.0.36:7861/knowledge_base/
knowledgeInterface: http://127.0.0.1:7861/knowledge_base/
#创建知识库
create: create_knowledge_base
#获取知识库列表
......@@ -163,7 +163,7 @@ redis:
# master-slave:
# 每个节点逗号分隔，第一个为主节点，其余为从节点。同时每个节点前必须以redis://开头。
# address: redis://localhost:6379,redis://localhost:6378,...
address: redis://192.168.0.35:6379
address: redis://127.0.0.1:6379
# 链接超时，单位毫秒。
timeout: 6000
# 单位毫秒。分布式锁的超时检测时长。
......@@ -177,9 +177,9 @@ redis:
# 连接池中最小空闲数量。
minIdle: 5
minio:
enabled: true
endpoint: http://192.168.0.145:9090
accessKey: minioadmin
secretKey: minioadmin
bucketName: application
#minio:
# enabled: true
# endpoint: http://192.168.0.145:9090
# accessKey: minioadmin
# secretKey: minioadmin
# bucketName: application
application-webadmin/src/main/resources/application.yml
View file @ 9bb9fa01
......@@ -44,7 +44,7 @@ spring:
allow-circular-references: true
data:
mongodb:
uri: mongodb://root:123456@192.168.0.36:27017/
uri: mongodb://127.0.0.1:27017
database: imp
authentication-database: admin
auto-index-creation: true
......
pom.xml
View file @ 9bb9fa01
......@@ -166,7 +166,11 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>io.github.biezhi</groupId>
<artifactId>TinyPinyin</artifactId>
<version>2.0.3.RELEASE</version>
</dependency>
</dependencies>
<dependencyManagement>
......
zz-resource/db-scripts/lmp.sql 0 → 100644
View file @ 9bb9fa01
This source diff could not be displayed because it is too large. You can view the blob instead.
zzlogs/application-webadmin/application-webadmin.log 0 → 100644
View file @ 9bb9fa01
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment