Commit c1d6fb02 authored by linpeiqin's avatar linpeiqin

修改对话接口,增加字典映射

parent 53dc8527
......@@ -131,7 +131,8 @@ public class ModelVersionController {
JSONObject jsonObject = new JSONObject();
jsonObject.put("new_model_name", modelVersion.getVersionName());
jsonObject.put("new_model_path", modelVersion.getModelUrl());
jsonObject.put("controller_address", pythonConfig.getControllerAddress());
jsonObject.put("template", modelVersion.getBasePromptTemplate());
jsonObject.put("finetuning_type", modelVersion.getModelTrainingMethod());
String url = this.pythonConfig.getChatAddress() + "llm_model/change";
String result = proxyPythonService.predictPost(url, jsonObject.toJSONString());
JSONObject jo = JSON.parseObject(result);
......@@ -152,10 +153,8 @@ public class ModelVersionController {
*/
@PostMapping("/stop")
public ResponseResult<String> stop() throws IOException {
JSONObject jsonObject = new JSONObject();
jsonObject.put("controller_address", pythonConfig.getControllerAddress());
String url = this.pythonConfig.getChatAddress() + "llm_model/stop";
String result = proxyPythonService.predictPost(url, jsonObject.toJSONString());
String result = proxyPythonService.predictPost(url, "");
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
......@@ -174,11 +173,8 @@ public class ModelVersionController {
*/
@PostMapping("/listModels")
public ResponseResult<JSONArray> listModels() throws IOException {
JSONObject jsonObject = new JSONObject();
jsonObject.put("placeholder", "string");
jsonObject.put("controller_address", pythonConfig.getControllerAddress());
String url = this.pythonConfig.getChatAddress() + "llm_model/list_models";
String result = proxyPythonService.predictPost(url, jsonObject.toJSONString());
String result = proxyPythonService.predictPost(url, "");
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
......
......@@ -3,11 +3,13 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToMany;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.DatasetManageVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
......@@ -15,6 +17,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
import java.util.Map;
/**
* DatasetManage实体对象。
......@@ -60,6 +63,17 @@ public class DatasetManage extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
......
......@@ -3,16 +3,20 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.DatasetVersionVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* DatasetVersion实体对象。
*
......@@ -111,6 +115,16 @@ public class DatasetVersion extends BaseModel {
@TableField(exist = false)
private DatasetDetail datasetDetail;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@Mapper
public interface DatasetVersionModelMapper extends BaseModelMapper<DatasetVersionVo, DatasetVersion> {
/**
......
......@@ -3,15 +3,19 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.KnowledgeManageVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* KnowledgeManage实体对象。
*
......@@ -45,6 +49,17 @@ public class KnowledgeManage extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
......
......@@ -3,17 +3,21 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.ModelCompressVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* ModelCompress实体对象。
*
......@@ -46,6 +50,17 @@ public class ModelCompress extends BaseModel {
*/
private Long sourceVersionId;
/**
* 源模型字典。
*/
@RelationDict(
masterIdField = "sourceVersionId",
slaveModelClass = ModelVersion.class,
slaveIdField = "versionId",
slaveNameField = "versionName")
@TableField(exist = false)
private Map<String, Object> sourceVersionIdDictMap;
/**
* 创建方式。
*/
......@@ -56,6 +71,17 @@ public class ModelCompress extends BaseModel {
*/
private Long targetVersionId;
/**
* 目标模型字典。
*/
@RelationDict(
masterIdField = "targetVersionId",
slaveModelClass = ModelVersion.class,
slaveIdField = "versionId",
slaveNameField = "versionName")
@TableField(exist = false)
private Map<String, Object> targetVersionIdDictMap;
/**
* 目标模型。
*/
......@@ -78,6 +104,17 @@ public class ModelCompress extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
......
......@@ -3,17 +3,21 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.ModelEstimateVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* ModelEstimate实体对象。
*
......@@ -45,12 +49,33 @@ public class ModelEstimate extends BaseModel {
* 待评估模型版本ID。
*/
private Long modelVersionId;
/**
* 评估模型版本字典。
*/
@RelationDict(
masterIdField = "modelVersionId",
slaveModelClass = ModelVersion.class,
slaveIdField = "versionId",
slaveNameField = "versionName")
@TableField(exist = false)
private Map<String, Object> modelVersionIdDictMap;
/**
* 评估数据集版本ID。
*/
private Long datasetVersionId;
/**
* 评估数据集版本字典。
*/
@RelationDict(
masterIdField = "datasetVersionId",
slaveModelClass = DatasetVersion.class,
slaveIdField = "versionId",
slaveNameField = "versionName")
@TableField(exist = false)
private Map<String, Object> datasetVersionIdDictMap;
/**
* 打分模式。
*/
......@@ -69,6 +94,17 @@ public class ModelEstimate extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
......
......@@ -3,6 +3,7 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToMany;
import com.yice.common.core.annotation.RelationOneToManyAggregation;
import com.yice.common.core.base.mapper.BaseModelMapper;
......@@ -10,6 +11,7 @@ import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.constant.AggregationType;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.ModelManageVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
......@@ -17,6 +19,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.List;
import java.util.Map;
/**
* ModelManage实体对象。
......@@ -86,6 +89,17 @@ public class ModelManage extends BaseModel {
@TableField(exist = false)
private String searchString;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
public void setSearchString(String searchString) {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
......
......@@ -3,10 +3,12 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.ModelTaskVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
......@@ -14,6 +16,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Date;
import java.util.Map;
/**
* ModelTask实体对象。
......@@ -81,6 +84,17 @@ public class ModelTask extends BaseModel {
@TableField(exist = false)
private ModelCompress modelCompress;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@Mapper
public interface ModelTaskModelMapper extends BaseModelMapper<ModelTaskVo, ModelTask> {
/**
......
......@@ -3,16 +3,20 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationOneToOne;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.ModelVersionVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* ModelVersion实体对象。
*
......@@ -134,6 +138,17 @@ public class ModelVersion extends BaseModel {
*/
private String basePromptTemplate;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@RelationOneToOne(
masterIdField = "modelId",
......
......@@ -3,11 +3,13 @@ package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.annotation.RelationGlobalDict;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.common.core.util.MyCommonUtil;
import com.yice.webadmin.app.vo.PromptTemplateVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
......@@ -114,6 +116,17 @@ public class PromptTemplate extends BaseModel {
this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
}
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@RelationGlobalDict(
masterIdField = "templateSource",
dictCode = "TemplateSourceLabel")
......
package com.yice.webadmin.app.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.base.mapper.BaseModelMapper;
import com.yice.common.core.base.model.BaseModel;
import com.yice.webadmin.app.vo.TuningRunVo;
import com.yice.webadmin.upms.model.SysUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.Map;
/**
* TuningRun实体对象。
*
......@@ -92,6 +97,17 @@ public class TuningRun extends BaseModel {
*/
private Integer publishStatus;
/**
* 创建人名称字典。
*/
@RelationDict(
masterIdField = "createUserId",
slaveModelClass = SysUser.class,
slaveIdField = "userId",
slaveNameField = "showName")
@TableField(exist = false)
private Map<String, Object> createUserIdDictMap;
@Mapper
public interface TuningRunModelMapper extends BaseModelMapper<TuningRunVo, TuningRun> {
}
......
......@@ -56,4 +56,10 @@ public class DatasetManageVo extends BaseVo {
*/
@ApiModelProperty(value = "DatasetVersion 的一对多关联表数据对象。数据对应类型为DatasetVersion")
private List<Map<String, Object>> datasetVersionList;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -121,4 +121,10 @@ public class DatasetVersionVo extends BaseVo {
*/
@ApiModelProperty(value = "versionId 的一对一关联数据对象,数据对应类型为DatasetDetailVo")
private Map<String, Object> datasetDetail;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Map;
/**
* KnowledgeManageVO视图对象。
*
......@@ -34,4 +36,10 @@ public class KnowledgeManageVo extends BaseVo {
*/
@ApiModelProperty(value = "知识库描述")
private String knowledgeDescribe;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
package com.yice.webadmin.app.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yice.common.core.annotation.RelationDict;
import com.yice.common.core.base.vo.BaseVo;
import com.yice.webadmin.app.model.ModelVersion;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -67,4 +70,22 @@ public class ModelCompressVo extends BaseVo {
*/
@ApiModelProperty(value = "taskId 的一对一关联数据对象,数据对应类型为ModelTaskVo")
private Map<String, Object> modelTask;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
/**
* 目标模型字典。
*/
@ApiModelProperty(value = "目标模型字典")
private Map<String, Object> targetVersionIdDictMap;
/**
* 源模型字典。
*/
@ApiModelProperty(value = "源模型字典")
private Map<String, Object> sourceVersionIdDictMap;
}
......@@ -71,4 +71,14 @@ public class ModelEstimateVo extends BaseVo {
*/
@ApiModelProperty(value = "taskId 的一对一关联数据对象,数据对应类型为ModelTaskVo")
private Map<String, Object> modelTask;
@ApiModelProperty(value = "数据集版本")
private Map<String, Object> datasetVersionIdDictMap;
@ApiModelProperty(value = "模型版本")
private Map<String, Object> modelVersionIdDictMap;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -85,4 +85,10 @@ public class ModelManageVo extends BaseVo {
*/
@ApiModelProperty(value = "ModelDeploy 的一对多关联表数据对象。数据对应类型为ModelDeploy")
private List<Map<String, Object>> modelDeployList;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -79,4 +79,10 @@ public class ModelTaskVo extends BaseVo {
*/
@ApiModelProperty(value = "taskId 的一对一关联数据对象,数据对应类型为ModelCompressVo")
private Map<String, Object> modelCompress;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -157,4 +157,10 @@ public class ModelVersionVo extends BaseVo {
*/
@ApiModelProperty(value = "默认的提示词模板")
private String basePromptTemplate;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -110,6 +110,12 @@ public class PromptTemplateVo extends BaseVo {
@ApiModelProperty(value = "逆向模板变量")
private String negativeTemplateVariables;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
/**
* templateSource 全局字典关联数据。
*/
......
......@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Map;
/**
* TuningRunVO视图对象。
*
......@@ -100,4 +102,10 @@ public class TuningRunVo extends BaseVo {
*/
@ApiModelProperty(value = "发布状态")
private Integer publishStatus;
/**
* 创建人名称。
*/
@ApiModelProperty(value = "创建人名称")
private Map<String, Object> createUserIdDictMap;
}
......@@ -80,7 +80,7 @@ python:
#输出控制地址
controllerAddress: http://0.0.0.0:20001
#对话基础路径
chatAddress: http://192.168.0.36:7861/
chatAddress: http://192.168.0.36:8000/
knowledge:
#知识库通用接口地址
......
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