mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-11 03:58:14 +00:00
[feature][common]Add permission management to chat model.
This commit is contained in:
@@ -1,9 +1,11 @@
|
|||||||
package com.tencent.supersonic.common.config;
|
package com.tencent.supersonic.common.config;
|
||||||
|
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import com.tencent.supersonic.common.pojo.ChatModelConfig;
|
import com.tencent.supersonic.common.pojo.ChatModelConfig;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class ChatModel {
|
public class ChatModel {
|
||||||
@@ -25,5 +27,11 @@ public class ChatModel {
|
|||||||
|
|
||||||
private String admin;
|
private String admin;
|
||||||
|
|
||||||
private String viewer;
|
private List<String> viewers = Lists.newArrayList();
|
||||||
|
|
||||||
|
private Integer isOpen = 0;
|
||||||
|
|
||||||
|
public boolean isPublic() {
|
||||||
|
return isOpen != null && isOpen == 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,4 +30,6 @@ public class ChatModelDO {
|
|||||||
private String admin;
|
private String admin;
|
||||||
|
|
||||||
private String viewer;
|
private String viewer;
|
||||||
|
|
||||||
|
private Integer isOpen;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import com.tencent.supersonic.common.pojo.User;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public interface ChatModelService {
|
public interface ChatModelService {
|
||||||
List<ChatModel> getChatModels();
|
List<ChatModel> getChatModels(User user);
|
||||||
|
|
||||||
ChatModel getChatModel(Integer id);
|
ChatModel getChatModel(Integer id);
|
||||||
|
|
||||||
|
|||||||
@@ -23,8 +23,15 @@ import java.util.stream.Collectors;
|
|||||||
public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModelDO>
|
public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModelDO>
|
||||||
implements ChatModelService {
|
implements ChatModelService {
|
||||||
@Override
|
@Override
|
||||||
public List<ChatModel> getChatModels() {
|
public List<ChatModel> getChatModels(User user) {
|
||||||
return list().stream().map(this::convert).collect(Collectors.toList());
|
return list().stream().map(this::convert).filter(chatModel -> {
|
||||||
|
if (chatModel.isPublic() || user.isSuperAdmin()
|
||||||
|
|| chatModel.getCreatedBy().equals(user.getName())
|
||||||
|
|| chatModel.getViewers().contains(user.getName())) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -41,12 +48,15 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
|
|||||||
chatModelDO.setCreatedBy(user.getName());
|
chatModelDO.setCreatedBy(user.getName());
|
||||||
chatModelDO.setCreatedAt(new Date());
|
chatModelDO.setCreatedAt(new Date());
|
||||||
chatModelDO.setUpdatedBy(user.getName());
|
chatModelDO.setUpdatedBy(user.getName());
|
||||||
chatModelDO.setUpdatedAt(new Date());
|
chatModelDO.setUpdatedAt(chatModelDO.getCreatedAt());
|
||||||
|
chatModelDO.setIsOpen(chatModel.getIsOpen());
|
||||||
if (StringUtils.isBlank(chatModel.getAdmin())) {
|
if (StringUtils.isBlank(chatModel.getAdmin())) {
|
||||||
chatModelDO.setAdmin(user.getName());
|
chatModelDO.setAdmin(user.getName());
|
||||||
}
|
}
|
||||||
|
if (!chatModel.getViewers().isEmpty()) {
|
||||||
|
chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
|
||||||
|
}
|
||||||
save(chatModelDO);
|
save(chatModelDO);
|
||||||
chatModel.setId(chatModelDO.getId());
|
|
||||||
return chatModel;
|
return chatModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,9 +65,13 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
|
|||||||
ChatModelDO chatModelDO = convert(chatModel);
|
ChatModelDO chatModelDO = convert(chatModel);
|
||||||
chatModelDO.setUpdatedBy(user.getName());
|
chatModelDO.setUpdatedBy(user.getName());
|
||||||
chatModelDO.setUpdatedAt(new Date());
|
chatModelDO.setUpdatedAt(new Date());
|
||||||
|
chatModelDO.setIsOpen(chatModel.getIsOpen());
|
||||||
if (StringUtils.isBlank(chatModel.getAdmin())) {
|
if (StringUtils.isBlank(chatModel.getAdmin())) {
|
||||||
chatModel.setAdmin(user.getName());
|
chatModel.setAdmin(user.getName());
|
||||||
}
|
}
|
||||||
|
if (!chatModel.getViewers().isEmpty()) {
|
||||||
|
chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
|
||||||
|
}
|
||||||
updateById(chatModelDO);
|
updateById(chatModelDO);
|
||||||
return chatModel;
|
return chatModel;
|
||||||
}
|
}
|
||||||
@@ -74,6 +88,7 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
|
|||||||
ChatModel chatModel = new ChatModel();
|
ChatModel chatModel = new ChatModel();
|
||||||
BeanUtils.copyProperties(chatModelDO, chatModel);
|
BeanUtils.copyProperties(chatModelDO, chatModel);
|
||||||
chatModel.setConfig(JsonUtil.toObject(chatModelDO.getConfig(), ChatModelConfig.class));
|
chatModel.setConfig(JsonUtil.toObject(chatModelDO.getConfig(), ChatModelConfig.class));
|
||||||
|
chatModel.setViewers(JsonUtil.toList(chatModelDO.getViewer(), String.class));
|
||||||
return chatModel;
|
return chatModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,9 +32,12 @@ public class DatabaseReq extends RecordInfo {
|
|||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
private String schema;
|
private String schema;
|
||||||
|
|
||||||
private String url;
|
private String url;
|
||||||
|
|
||||||
private List<String> admins = Lists.newArrayList();
|
private List<String> admins = Lists.newArrayList();
|
||||||
|
|
||||||
private List<String> viewers = Lists.newArrayList();
|
private List<String> viewers = Lists.newArrayList();
|
||||||
|
|
||||||
|
private Integer isOpen = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ public class DatabaseResp extends RecordInfo {
|
|||||||
|
|
||||||
private List<String> viewers = Lists.newArrayList();
|
private List<String> viewers = Lists.newArrayList();
|
||||||
|
|
||||||
|
private Integer isOpen = 0;
|
||||||
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
private String url;
|
private String url;
|
||||||
@@ -48,6 +50,10 @@ public class DatabaseResp extends RecordInfo {
|
|||||||
|
|
||||||
private boolean hasEditPermission = false;
|
private boolean hasEditPermission = false;
|
||||||
|
|
||||||
|
public boolean isPublic() {
|
||||||
|
return isOpen != null && isOpen == 1;
|
||||||
|
}
|
||||||
|
|
||||||
public String getHost() {
|
public String getHost() {
|
||||||
Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+).*");
|
Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+).*");
|
||||||
Matcher m = p.matcher(url);
|
Matcher m = p.matcher(url);
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ public class DatabaseDO {
|
|||||||
/** */
|
/** */
|
||||||
private String viewer;
|
private String viewer;
|
||||||
|
|
||||||
|
private Integer isOpen = 0;
|
||||||
|
|
||||||
/** 配置信息 */
|
/** 配置信息 */
|
||||||
private String config;
|
private String config;
|
||||||
|
|
||||||
|
|||||||
@@ -52,8 +52,10 @@ public class ChatModelController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/getModelList")
|
@RequestMapping("/getModelList")
|
||||||
public List<ChatModel> getModelList() {
|
public List<ChatModel> getModelList(HttpServletRequest httpServletRequest,
|
||||||
return chatModelService.getChatModels();
|
HttpServletResponse httpServletResponse) {
|
||||||
|
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||||
|
return chatModelService.getChatModels(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/getModelAppList")
|
@RequestMapping("/getModelAppList")
|
||||||
|
|||||||
@@ -96,14 +96,16 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
|
|||||||
databaseResp.setHasEditPermission(true);
|
databaseResp.setHasEditPermission(true);
|
||||||
databaseResp.setHasUsePermission(true);
|
databaseResp.setHasUsePermission(true);
|
||||||
}
|
}
|
||||||
if (databaseResp.getViewers().contains(user.getName())) {
|
if (databaseResp.getViewers().contains(user.getName())
|
||||||
|
|| databaseResp.isPublic()) {
|
||||||
databaseResp.setHasUsePermission(true);
|
databaseResp.setHasUsePermission(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean filterByAuth(DatabaseResp database, User user, AuthType authType) {
|
private boolean filterByAuth(DatabaseResp database, User user, AuthType authType) {
|
||||||
if (user.isSuperAdmin() || user.getName().equals(database.getCreatedBy())) {
|
if (database.isPublic() || user.isSuperAdmin()
|
||||||
|
|| user.getName().equals(database.getCreatedBy())) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
authType = authType == null ? AuthType.VIEWER : authType;
|
authType = authType == null ? AuthType.VIEWER : authType;
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ public abstract class S2BaseDemo implements CommandLineRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected ChatModel addChatModelIfNotExist() {
|
protected ChatModel addChatModelIfNotExist() {
|
||||||
List<ChatModel> chatModels = chatModelService.getChatModels();
|
List<ChatModel> chatModels = chatModelService.getChatModels(defaultUser);
|
||||||
if (!chatModels.isEmpty()) {
|
if (!chatModels.isEmpty()) {
|
||||||
return chatModels.get(0);
|
return chatModels.get(0);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -414,3 +414,7 @@ ALTER TABLE s2_agent add column `is_open` tinyint DEFAULT NULL COMMENT '是否
|
|||||||
|
|
||||||
--20250309
|
--20250309
|
||||||
ALTER TABLE s2_model_rela alter column join_condition type text;
|
ALTER TABLE s2_model_rela alter column join_condition type text;
|
||||||
|
|
||||||
|
--20250310
|
||||||
|
ALTER TABLE s2_chat_model add column is_open tinyint DEFAULT NULL COMMENT '是否公开';
|
||||||
|
ALTER TABLE s2_database add column is_open tinyint DEFAULT NULL COMMENT '是否公开';
|
||||||
@@ -116,6 +116,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model`
|
|||||||
`updated_by` varchar(100) NOT NULL,
|
`updated_by` varchar(100) NOT NULL,
|
||||||
`admin` varchar(500) NOT NULL,
|
`admin` varchar(500) NOT NULL,
|
||||||
`viewer` varchar(500) DEFAULT NULL,
|
`viewer` varchar(500) DEFAULT NULL,
|
||||||
|
`is_open` TINYINT DEFAULT NULL , -- whether public
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
); COMMENT ON TABLE s2_chat_model IS 'chat model table';
|
); COMMENT ON TABLE s2_chat_model IS 'chat model table';
|
||||||
|
|
||||||
@@ -197,6 +198,7 @@ CREATE TABLE IF NOT EXISTS `s2_database` (
|
|||||||
`updated_by` varchar(100) NOT NULL,
|
`updated_by` varchar(100) NOT NULL,
|
||||||
`admin` varchar(500) NOT NULL,
|
`admin` varchar(500) NOT NULL,
|
||||||
`viewer` varchar(500) DEFAULT NULL,
|
`viewer` varchar(500) DEFAULT NULL,
|
||||||
|
`is_open` TINYINT DEFAULT NULL , -- whether public
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
);
|
);
|
||||||
COMMENT ON TABLE s2_database IS 'database instance table';
|
COMMENT ON TABLE s2_database IS 'database instance table';
|
||||||
@@ -379,7 +381,7 @@ CREATE TABLE IF NOT EXISTS s2_agent
|
|||||||
enable_feedback int null,
|
enable_feedback int null,
|
||||||
`admin` varchar(3000) DEFAULT NULL , -- administrator
|
`admin` varchar(3000) DEFAULT NULL , -- administrator
|
||||||
`admin_org` varchar(3000) DEFAULT NULL , -- administrators organization
|
`admin_org` varchar(3000) DEFAULT NULL , -- administrators organization
|
||||||
`is_open` TINYINT DEFAULT NULL , -- whether the public
|
`is_open` TINYINT DEFAULT NULL , -- whether public
|
||||||
`viewer` varchar(3000) DEFAULT NULL , -- available users
|
`viewer` varchar(3000) DEFAULT NULL , -- available users
|
||||||
`view_org` varchar(3000) DEFAULT NULL , -- available organization
|
`view_org` varchar(3000) DEFAULT NULL , -- available organization
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
|
|||||||
@@ -161,6 +161,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model` (
|
|||||||
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
|
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
|
||||||
`admin` varchar(500) DEFAULT NULL,
|
`admin` varchar(500) DEFAULT NULL,
|
||||||
`viewer` varchar(500) DEFAULT NULL,
|
`viewer` varchar(500) DEFAULT NULL,
|
||||||
|
`is_open` tinyint DEFAULT NULL COMMENT '是否公开',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='对话大模型实例表';
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='对话大模型实例表';
|
||||||
|
|
||||||
@@ -177,6 +178,7 @@ CREATE TABLE IF NOT EXISTS `s2_database` (
|
|||||||
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
|
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
|
||||||
`admin` varchar(500) DEFAULT NULL,
|
`admin` varchar(500) DEFAULT NULL,
|
||||||
`viewer` varchar(500) DEFAULT NULL,
|
`viewer` varchar(500) DEFAULT NULL,
|
||||||
|
`is_open` tinyint DEFAULT NULL COMMENT '是否公开',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据库实例表';
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据库实例表';
|
||||||
|
|
||||||
|
|||||||
@@ -147,7 +147,8 @@ CREATE TABLE IF NOT EXISTS s2_chat_model (
|
|||||||
updated_at timestamp NOT NULL,
|
updated_at timestamp NOT NULL,
|
||||||
updated_by varchar(100) NOT NULL,
|
updated_by varchar(100) NOT NULL,
|
||||||
admin varchar(500) DEFAULT NULL,
|
admin varchar(500) DEFAULT NULL,
|
||||||
viewer varchar(500) DEFAULT NULL
|
viewer varchar(500) DEFAULT NULL,
|
||||||
|
is_open smallint DEFAULT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS s2_database (
|
CREATE TABLE IF NOT EXISTS s2_database (
|
||||||
@@ -162,7 +163,8 @@ CREATE TABLE IF NOT EXISTS s2_database (
|
|||||||
updated_at timestamp NOT NULL,
|
updated_at timestamp NOT NULL,
|
||||||
updated_by varchar(100) NOT NULL,
|
updated_by varchar(100) NOT NULL,
|
||||||
admin varchar(500) DEFAULT NULL,
|
admin varchar(500) DEFAULT NULL,
|
||||||
viewer varchar(500) DEFAULT NULL
|
viewer varchar(500) DEFAULT NULL,
|
||||||
|
is_open smallint DEFAULT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user