topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[feature][common]Add permission management to chat model.

Browse Source
This commit is contained in:
jerryjzhang
2025-03-10 23:58:19 +08:00
parent 0dbf56d357
commit 93d585c0d5
14 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java
View File

@@ -1,9 +1,11 @@
package com.tencent.supersonic.common.config;
import com.google.common.collect.Lists;
import com.tencent.supersonic.common.pojo.ChatModelConfig;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class ChatModel {
@@ -25,5 +27,11 @@ public class ChatModel {
private String admin;
private String viewer;
private List<String> viewers = Lists.newArrayList();
private Integer isOpen = 0;
public boolean isPublic() {
return isOpen != null && isOpen == 1;
}
}

2
common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java
View File

@@ -30,4 +30,6 @@ public class ChatModelDO {
private String admin;
private String viewer;
private Integer isOpen;
}

2
common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java
View File

@@ -7,7 +7,7 @@ import com.tencent.supersonic.common.pojo.User;
import java.util.List;
public interface ChatModelService {
List<ChatModel> getChatModels();
List<ChatModel> getChatModels(User user);
ChatModel getChatModel(Integer id);

23
common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java
View File

@@ -23,8 +23,15 @@ import java.util.stream.Collectors;
public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModelDO>
implements ChatModelService {
@Override
public List<ChatModel> getChatModels() {
return list().stream().map(this::convert).collect(Collectors.toList());
public List<ChatModel> getChatModels(User user) {
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
@@ -41,12 +48,15 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
chatModelDO.setCreatedBy(user.getName());
chatModelDO.setCreatedAt(new Date());
chatModelDO.setUpdatedBy(user.getName());
chatModelDO.setUpdatedAt(new Date());
chatModelDO.setUpdatedAt(chatModelDO.getCreatedAt());
chatModelDO.setIsOpen(chatModel.getIsOpen());
if (StringUtils.isBlank(chatModel.getAdmin())) {
chatModelDO.setAdmin(user.getName());
}
if (!chatModel.getViewers().isEmpty()) {
chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
}
save(chatModelDO);
chatModel.setId(chatModelDO.getId());
return chatModel;
}
@@ -55,9 +65,13 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
ChatModelDO chatModelDO = convert(chatModel);
chatModelDO.setUpdatedBy(user.getName());
chatModelDO.setUpdatedAt(new Date());
chatModelDO.setIsOpen(chatModel.getIsOpen());
if (StringUtils.isBlank(chatModel.getAdmin())) {
chatModel.setAdmin(user.getName());
}
if (!chatModel.getViewers().isEmpty()) {
chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
}
updateById(chatModelDO);
return chatModel;
}
@@ -74,6 +88,7 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
ChatModel chatModel = new ChatModel();
BeanUtils.copyProperties(chatModelDO, chatModel);
chatModel.setConfig(JsonUtil.toObject(chatModelDO.getConfig(), ChatModelConfig.class));
chatModel.setViewers(JsonUtil.toList(chatModelDO.getViewer(), String.class));
return chatModel;
}

3
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DatabaseReq.java
View File

@@ -32,9 +32,12 @@ public class DatabaseReq extends RecordInfo {
private String description;
private String schema;
private String url;
private List<String> admins = Lists.newArrayList();
private List<String> viewers = Lists.newArrayList();
private Integer isOpen = 0;
}

6
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java
View File

@@ -28,6 +28,8 @@ public class DatabaseResp extends RecordInfo {
private List<String> viewers = Lists.newArrayList();
private Integer isOpen = 0;
private String type;
private String url;
@@ -48,6 +50,10 @@ public class DatabaseResp extends RecordInfo {
private boolean hasEditPermission = false;
public boolean isPublic() {
return isOpen != null && isOpen == 1;
}
public String getHost() {
Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+).*");
Matcher m = p.matcher(url);

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/DatabaseDO.java
View File

@@ -44,6 +44,8 @@ public class DatabaseDO {
/** */
private String viewer;
private Integer isOpen = 0;
/** 配置信息 */
private String config;

6
headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java
View File

@@ -52,8 +52,10 @@ public class ChatModelController {
}
@RequestMapping("/getModelList")
public List<ChatModel> getModelList() {
return chatModelService.getChatModels();
public List<ChatModel> getModelList(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse) {
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
return chatModelService.getChatModels(user);
}
@RequestMapping("/getModelAppList")

6
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
View File

@@ -96,14 +96,16 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
databaseResp.setHasEditPermission(true);
databaseResp.setHasUsePermission(true);
}
if (databaseResp.getViewers().contains(user.getName())) {
if (databaseResp.getViewers().contains(user.getName())
|| databaseResp.isPublic()) {
databaseResp.setHasUsePermission(true);
}
});
}
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;
}
authType = authType == null ? AuthType.VIEWER : authType;

2
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java
View File

@@ -140,7 +140,7 @@ public abstract class S2BaseDemo implements CommandLineRunner {
}
protected ChatModel addChatModelIfNotExist() {
List<ChatModel> chatModels = chatModelService.getChatModels();
List<ChatModel> chatModels = chatModelService.getChatModels(defaultUser);
if (!chatModels.isEmpty()) {
return chatModels.get(0);
} else {

6
launchers/standalone/src/main/resources/config.update/sql-update-mysql.sql
View File

@@ -413,4 +413,8 @@ ALTER TABLE s2_agent add column `view_org` varchar(3000) DEFAULT NULL COMMENT '
ALTER TABLE s2_agent add column `is_open` tinyint DEFAULT NULL COMMENT '是否公开';
--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 '是否公开';

4
launchers/standalone/src/main/resources/db/schema-h2.sql
View File

@@ -116,6 +116,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model`
`updated_by` varchar(100) NOT NULL,
`admin` varchar(500) NOT NULL,
`viewer` varchar(500) DEFAULT NULL,
`is_open` TINYINT DEFAULT NULL , -- whether public
PRIMARY KEY (`id`)
); 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,
`admin` varchar(500) NOT NULL,
`viewer` varchar(500) DEFAULT NULL,
`is_open` TINYINT DEFAULT NULL , -- whether public
PRIMARY KEY (`id`)
);
COMMENT ON TABLE s2_database IS 'database instance table';
@@ -379,7 +381,7 @@ CREATE TABLE IF NOT EXISTS s2_agent
enable_feedback int null,
`admin` varchar(3000) DEFAULT NULL , -- administrator
`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
`view_org` varchar(3000) DEFAULT NULL , -- available organization
PRIMARY KEY (`id`)

2
launchers/standalone/src/main/resources/db/schema-mysql.sql
View File

@@ -161,6 +161,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model` (
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
`admin` varchar(500) DEFAULT NULL,
`viewer` varchar(500) DEFAULT NULL,
`is_open` tinyint DEFAULT NULL COMMENT '是否公开',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='对话大模型实例表';
@@ -177,6 +178,7 @@ CREATE TABLE IF NOT EXISTS `s2_database` (
`updated_by` varchar(100) NOT NULL COMMENT '更新人',
`admin` varchar(500) DEFAULT NULL,
`viewer` varchar(500) DEFAULT NULL,
`is_open` tinyint DEFAULT NULL COMMENT '是否公开',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据库实例表';

6
launchers/standalone/src/main/resources/db/schema-postgres.sql
View File

@@ -147,7 +147,8 @@ CREATE TABLE IF NOT EXISTS s2_chat_model (
updated_at timestamp NOT NULL,
updated_by varchar(100) NOT 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 (
@@ -162,7 +163,8 @@ CREATE TABLE IF NOT EXISTS s2_database (
updated_at timestamp NOT NULL,
updated_by varchar(100) NOT NULL,
admin varchar(500) DEFAULT NULL,
viewer varchar(500) DEFAULT NULL
viewer varchar(500) DEFAULT NULL,
is_open smallint DEFAULT NULL
);