模型缓存调整

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/AskModelController.java

@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.apache.poi.util.StringUtil;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -32,66 +33,67 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class AskModelController {
 
-	private final AskModelService askModelService;
+    private final AskModelService askModelService;
 
-	@Operation(summary = "创建模型")
-	@PostMapping("/model")
-	public R<Boolean> createModel(@Parameter(description = "模型信息") @RequestBody AskModel model){
-		return R.ok(askModelService.createModel(model));
-	}
+    @Operation(summary = "创建模型")
+    @PostMapping("/model")
+    public R<Boolean> createModel(@Parameter(description = "模型信息") @RequestBody AskModel model) {
+        return R.ok(askModelService.createModel(model));
+    }
 
-	@Operation(summary = "获取模型列表")
-	@GetMapping("/model")
-	public R<List<AskModel>> models(@Parameter(description = "模型名称") String name, @Parameter(description = "模型类型") String modelType, @Parameter(description = "提供商") String provider){
-		return R.ok(askModelService.models(name,modelType,provider));
-	}
+    @Operation(summary = "获取模型列表")
+    @GetMapping("/model")
+    public R<List<AskModel>> models(@Parameter(description = "模型名称") String name, @Parameter(description = "模型类型") String modelType, @Parameter(description = "提供商") String provider) {
+        return R.ok(askModelService.models(name, modelType, provider));
+    }
 
-	@Operation(summary = "根据ID获取模型")
-	@GetMapping("/model/{id}")
-	public R<AskModel> get(@Parameter(description = "模型ID") @PathVariable Long id){
-		return R.ok(askModelService.getById(id));
-	}
+    @Operation(summary = "根据ID获取模型")
+    @GetMapping("/model/{id}")
+    public R<AskModel> get(@Parameter(description = "模型ID") @PathVariable Long id) {
+        return R.ok(askModelService.getById(id));
+    }
 
-	@Operation(summary = "删除模型")
-	@DeleteMapping("/model/{id}")
-	public R<Boolean> delete(@Parameter(description = "模型ID") @PathVariable Long id){
-		return R.ok(askModelService.removeById(id));
-	}
+    @Operation(summary = "删除模型")
+    @DeleteMapping("/model/{id}")
+    @CacheEvict(cacheNames = {"chatClient", "embeddingMode", "vectorStore"}, key = "#model.id")
+    public R<Boolean> delete(@Parameter(description = "模型ID") @PathVariable Long id) {
+        return R.ok(askModelService.removeById(id));
+    }
 
-	@Operation(summary = "更新模型")
-	@PutMapping("/model/{id}")
-	public R<AskModel> update(@Parameter(description = "模型ID") @PathVariable Long id, @Parameter(description = "模型信息") @RequestBody AskModel model){
-		return R.ok(askModelService.updateModel(id,model));
-	}
+    @Operation(summary = "更新模型")
+    @PutMapping("/model/{id}")
+    public R<AskModel> update(@Parameter(description = "模型ID") @PathVariable Long id, @Parameter(description = "模型信息") @RequestBody AskModel model) {
+        return R.ok(askModelService.updateModel(id, model));
+    }
 
-	@Operation(summary = "获取厂商列表")
-	@GetMapping("/providers")
-	public R<List<Map<String, String>>> getProviders(){
-		List<Map<String, String>> providers = Arrays.stream(ModelProviderEnum.values())
-				.map(provider -> {
-					Map<String, String> providerMap = new HashMap<>();
-					providerMap.put("provider", provider.getProvider());
-					providerMap.put("name", provider.getName());
-					return providerMap;
-				})
-				.collect(Collectors.toList());
-		return R.ok(providers);
-	}
+    @Operation(summary = "获取厂商列表")
+    @GetMapping("/providers")
+    public R<List<Map<String, String>>> getProviders() {
+        List<Map<String, String>> providers = Arrays.stream(ModelProviderEnum.values())
+                .map(provider -> {
+                    Map<String, String> providerMap = new HashMap<>();
+                    providerMap.put("provider", provider.getProvider());
+                    providerMap.put("name", provider.getName());
+                    return providerMap;
+                })
+                .collect(Collectors.toList());
+        return R.ok(providers);
+    }
 
-	@Operation(summary = "获取模型类型列表")
-	@GetMapping("/types")
-	public R<List<Map<String, String>>> getModelTypes(){
-		List<Map<String, String>> types = Arrays.stream(ModelTypeEnum.values())
-				.map(type -> {
-					Map<String, String> typeMap = new HashMap<>();
-					typeMap.put("code", type.getCode());
-					typeMap.put("name", type.getName());
-					typeMap.put("description", type.getDescription());
-					return typeMap;
-				})
-				.collect(Collectors.toList());
-		return R.ok(types);
-	}
+    @Operation(summary = "获取模型类型列表")
+    @GetMapping("/types")
+    public R<List<Map<String, String>>> getModelTypes() {
+        List<Map<String, String>> types = Arrays.stream(ModelTypeEnum.values())
+                .map(type -> {
+                    Map<String, String> typeMap = new HashMap<>();
+                    typeMap.put("code", type.getCode());
+                    typeMap.put("name", type.getName());
+                    typeMap.put("description", type.getDescription());
+                    return typeMap;
+                })
+                .collect(Collectors.toList());
+        return R.ok(types);
+    }
 
 
 }

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/service/impl/AskModelServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -51,6 +52,9 @@ public class AskModelServiceImpl extends ServiceImpl<AskModelMapper, AskModel> i
     @Override
     public ChatClient getChatClientById(Long modelId) {
         AskModel askModel = this.getById(modelId);
+        if(askModel.getStatus()==1){
+            return null;
+        }
         IBaseModel baseModel = ModelProviderEnum.get(askModel.getProvider());
         if (Objects.isNull(baseModel)) {
             return null;
@@ -63,6 +67,9 @@ public class AskModelServiceImpl extends ServiceImpl<AskModelMapper, AskModel> i
     @Override
     public EmbeddingModel getEmbeddingModelById(Long modelId) {
         AskModel askModel = this.getById(modelId);
+        if(askModel.getStatus()==1){
+            return null;
+        }
         IBaseModel baseModel = ModelProviderEnum.get(askModel.getProvider());
         if (Objects.isNull(baseModel)) {
             return null;
@@ -86,6 +93,7 @@ public class AskModelServiceImpl extends ServiceImpl<AskModelMapper, AskModel> i
     }
 
     @Override
+    @CacheEvict(cacheNames = {"chatClient", "embeddingMode", "vectorStore"}, key = "#model.id")
     public AskModel updateModel(Long id, AskModel model) {
         model.setId(id);
         this.updateById(model);