diff --git a/src/main/java/com/inspect/simulator/domain/bigmodelr/Content.java b/src/main/java/com/inspect/simulator/domain/bigmodelr/Content.java index 40f5993..b627b12 100644 --- a/src/main/java/com/inspect/simulator/domain/bigmodelr/Content.java +++ b/src/main/java/com/inspect/simulator/domain/bigmodelr/Content.java @@ -14,4 +14,6 @@ public class Content { @JsonInclude(JsonInclude.Include.NON_NULL) @JsonProperty("image_url") private ImageUrl imageUrl; // type=image_url时使用 + + private String image; } \ No newline at end of file diff --git a/src/main/java/com/inspect/simulator/service/impl/ModelServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/ModelServiceImpl.java index 3f5e377..d537804 100644 --- a/src/main/java/com/inspect/simulator/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/ModelServiceImpl.java @@ -40,10 +40,10 @@ public class ModelServiceImpl implements ModelService { // @Value("${file.dmtModelUrl:test}") - private String dmtModelUrl ="http://25.80.45.91:80/xlm-gateway-ygubrj/sfm-api-gateway/gateway/compatible-mode/v1/chat/completions"; + private String dmtModelUrl ="http://25.80.45.92:18063/lmp-cloud-ias-server/api/vlm/chat/completions/"; // @Value("${file.dmtModelHeader:test}") - private String dmtModelHeader = "Bearer 2NgrVjFfoY1RqKQiSZe7lYpS0CaUUMiq"; + private String dmtModelHeader = "54c1ae2c5fd54afe85e74d6fe9161f7f"; @Resource private AnalysisRemoteService analysisRemoteService; @@ -291,8 +291,6 @@ public class ModelServiceImpl implements ModelService { } - - //多模态大模型 public String Multimodal(Multimodal multimodal) { // 重试次数 @@ -330,7 +328,7 @@ public class ModelServiceImpl implements ModelService { private ChatCompletionRequest buildCorrectRequest(Multimodal multimodal) { ChatCompletionRequest request = new ChatCompletionRequest(); // 设置模型名称,默认"rsv-0zygizvz" - request.setModel(multimodal.getModel() != null ? multimodal.getModel() : "rsv-0zygizvz"); + request.setModel(multimodal.getModel() != null ? multimodal.getModel() : "SGGM-VL-74B-V1.2"); // 构建消息内容列表 List contents = new ArrayList<>(); @@ -354,8 +352,7 @@ public class ModelServiceImpl implements ModelService { if (StringUtils.isNotBlank(multimodal.getImageData())) { Content imageContent = new Content(); imageContent.setType("image_url"); - - ImageUrl imageUrl = new ImageUrl(); +// ImageUrl imageUrl = new ImageUrl(); // 获取文件扩展名,默认为jpg String fileExtension = "jpg"; if (StringUtils.isNotBlank(multimodal.getImageName())) { @@ -367,9 +364,9 @@ public class ModelServiceImpl implements ModelService { // 转换图片为base64 String base64String = convertToBase64(multimodal.getImageData()); - imageUrl.setUrl("data:image/" + fileExtension + ";base64," + base64String); - - imageContent.setImageUrl(imageUrl); + imageContent.setImage("data:image/" + fileExtension + ";base64," + base64String); +// imageUrl.setUrl("data:image/" + fileExtension + ";base64," + base64String); +// imageContent.setImageUrl(imageUrl); contents.add(imageContent); } // 构建消息 @@ -381,6 +378,7 @@ public class ModelServiceImpl implements ModelService { request.setMaxTokens(multimodal.getMaxTokens() > 0 ? multimodal.getMaxTokens() : 300); request.setMessages(Collections.singletonList(message)); + return request; }