Commit b0f73831 authored by linpeiqin's avatar linpeiqin

新增部署功能

parent 91ecb374
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.ModelDeploy"> <resultMap id="BaseResultMap" type="com.yice.webadmin.app.model.ModelDeploy">
<id column="deploy_id" jdbcType="BIGINT" property="deployId"/> <id column="deploy_id" jdbcType="BIGINT" property="deployId"/>
<result column="model_id" jdbcType="BIGINT" property="modelId"/> <result column="model_id" jdbcType="BIGINT" property="modelId"/>
<result column="model_name" jdbcType="VARCHAR" property="modelName"/>
<result column="version_id" jdbcType="BIGINT" property="versionId"/> <result column="version_id" jdbcType="BIGINT" property="versionId"/>
<result column="version_name" jdbcType="VARCHAR" property="versionName"/> <result column="version_name" jdbcType="VARCHAR" property="versionName"/>
<result column="deploy_status" jdbcType="TINYINT" property="deployStatus"/> <result column="deploy_status" jdbcType="TINYINT" property="deployStatus"/>
...@@ -15,12 +16,15 @@ ...@@ -15,12 +16,15 @@
<result column="service_id" jdbcType="BIGINT" property="serviceId"/> <result column="service_id" jdbcType="BIGINT" property="serviceId"/>
<result column="service_name" jdbcType="VARCHAR" property="serviceName"/> <result column="service_name" jdbcType="VARCHAR" property="serviceName"/>
<result column="service_version" jdbcType="TINYINT" property="serviceVersion"/> <result column="service_version" jdbcType="TINYINT" property="serviceVersion"/>
<result column="resource_info" jdbcType="VARCHAR" property="resourceInfo"/>
<result column="service_remark" jdbcType="VARCHAR" property="serviceRemark"/>
</resultMap> </resultMap>
<insert id="insertList"> <insert id="insertList">
INSERT INTO lmp_model_deploy INSERT INTO lmp_model_deploy
(deploy_id, (deploy_id,
model_id, model_id,
model_name,
version_id, version_id,
version_name, version_name,
deploy_status, deploy_status,
...@@ -31,11 +35,14 @@ ...@@ -31,11 +35,14 @@
model_version, model_version,
service_id, service_id,
service_name, service_name,
service_version) service_version,
resource_info,
service_remark)
VALUES VALUES
<foreach collection="list" index="index" item="item" separator=","> <foreach collection="list" index="index" item="item" separator=",">
(#{item.deployId}, (#{item.deployId},
#{item.modelId}, #{item.modelId},
#{item.modelName},
#{item.versionId}, #{item.versionId},
#{item.versionName}, #{item.versionName},
#{item.deployStatus}, #{item.deployStatus},
...@@ -46,7 +53,9 @@ ...@@ -46,7 +53,9 @@
#{item.modelVersion}, #{item.modelVersion},
#{item.serviceId}, #{item.serviceId},
#{item.serviceName}, #{item.serviceName},
#{item.serviceVersion}) #{item.serviceVersion},
#{item.resourceInfo},
#{item.serviceRemark})
</foreach> </foreach>
</insert> </insert>
......
...@@ -30,6 +30,12 @@ public class ModelDeployDto { ...@@ -30,6 +30,12 @@ public class ModelDeployDto {
@ApiModelProperty(value = "模型ID") @ApiModelProperty(value = "模型ID")
private Long modelId; private Long modelId;
/**
* 模型名称。
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/** /**
* 版本ID。 * 版本ID。
*/ */
...@@ -71,4 +77,22 @@ public class ModelDeployDto { ...@@ -71,4 +77,22 @@ public class ModelDeployDto {
*/ */
@ApiModelProperty(value = "服务版本") @ApiModelProperty(value = "服务版本")
private Integer serviceVersion; private Integer serviceVersion;
/**
* 资源信息。
*/
@ApiModelProperty(value = "资源信息")
private String resourceInfo;
/**
* 服务描述。
*/
@ApiModelProperty(value = "服务描述")
private String serviceRemark;
/**
* 资源id。
*/
@ApiModelProperty(value = "资源id")
private String gpuIds;
} }
...@@ -32,6 +32,10 @@ public class ModelDeploy extends BaseModel { ...@@ -32,6 +32,10 @@ public class ModelDeploy extends BaseModel {
*/ */
private Long modelId; private Long modelId;
/**
* 模型名称。
*/
private String modelName;
/** /**
* 版本ID。 * 版本ID。
*/ */
...@@ -67,6 +71,16 @@ public class ModelDeploy extends BaseModel { ...@@ -67,6 +71,16 @@ public class ModelDeploy extends BaseModel {
*/ */
private Integer serviceVersion; private Integer serviceVersion;
/**
* 资源信息。
*/
private String resourceInfo;
/**
* 服务描述。
*/
private String serviceRemark;
@Mapper @Mapper
public interface ModelDeployModelMapper extends BaseModelMapper<ModelDeployVo, ModelDeploy> { public interface ModelDeployModelMapper extends BaseModelMapper<ModelDeployVo, ModelDeploy> {
} }
......
...@@ -28,7 +28,11 @@ public class ModelDeployVo extends BaseVo { ...@@ -28,7 +28,11 @@ public class ModelDeployVo extends BaseVo {
*/ */
@ApiModelProperty(value = "模型ID") @ApiModelProperty(value = "模型ID")
private Long modelId; private Long modelId;
/**
* 模型名称。
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/** /**
* 版本ID。 * 版本ID。
*/ */
...@@ -70,4 +74,15 @@ public class ModelDeployVo extends BaseVo { ...@@ -70,4 +74,15 @@ public class ModelDeployVo extends BaseVo {
*/ */
@ApiModelProperty(value = "服务版本") @ApiModelProperty(value = "服务版本")
private Integer serviceVersion; private Integer serviceVersion;
/**
* 资源信息。
*/
@ApiModelProperty(value = "资源信息")
private String resourceInfo;
/**
* 服务描述。
*/
@ApiModelProperty(value = "服务描述")
private String serviceRemark;
} }
...@@ -78,10 +78,25 @@ python: ...@@ -78,10 +78,25 @@ python:
#python websocket 服务地址 #python websocket 服务地址
pythonWebsocketUri: ws://192.168.0.36:7860/queue/join pythonWebsocketUri: ws://192.168.0.36:7860/queue/join
#输出控制地址 #输出控制地址
controllerAddress: http://192.168.0.36:20001 controllerAddress: http://127.0.0.1:20001
#对话基础路径 #对话基础路径
chatAddress: http://192.168.0.36:7861/ chatAddress: http://192.168.0.36:8000/
llm-model:
#模型管理基础路径
llmModelInterface: http://192.168.0.36:7861/llm_model/
#模型停止
stop: stop
#模型模型部署
reload: reload
#模型部署
start: start
#列出当前已加载模型
listRunningModels: list_running_models
other:
#其他管理接口
otherInterface: http://192.168.0.36:7861/other/
#获取gpu信息
getGpuInfo: get_gpu_info
knowledge: knowledge:
#知识库通用接口地址 #知识库通用接口地址
knowledgeInterface: http://192.168.0.36:7861/knowledge_base/ knowledgeInterface: http://192.168.0.36:7861/knowledge_base/
......
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