diff --git a/src/main/java/com/ai/da/common/constant/ModelConstants.java b/src/main/java/com/ai/da/common/constant/ModelConstants.java index bc0b1745..fab503bb 100644 --- a/src/main/java/com/ai/da/common/constant/ModelConstants.java +++ b/src/main/java/com/ai/da/common/constant/ModelConstants.java @@ -20,7 +20,7 @@ public class ModelConstants { public static final String PRINTBOARD_ADVANCED_T2I = "qwen-image"; public static final String MOODBOARD_ADVANCED = "doubao-seedream-3-0-t2i-250415"; public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415"; - public static final String PRINTBOARD_HIGH_I2I = "doubao-seededit-3-0-i2i-250628"; + public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828-fast"; public static final String PRINTBOARD_ADVANCED_I2I = "doubao-seedream-4-0-250828"; public static final String IMAGEN_MODEL = "imagen-4.0-generate-001"; public static final String NANO_BANANA = "gemini-2.5-flash-image"; diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 3ffad287..4ba86ce3 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -72,6 +72,8 @@ public class PythonService { private String accessPythonPort; @Value("${minio.bucketName.gradient}") private String gradientBucketName; + @Value("${minio.bucketName.users}") + private String userBucketName; @Value("${access.python.generate_sr_port}") private String srServicePort; @@ -3343,7 +3345,7 @@ public class PythonService { throw new BusinessException("system error!"); } - public Boolean generateSketchOrPrint(String params, String port, String servicePath,String taskId) { + public Boolean generateSketchOrPrint(String params, String port, String servicePath, String taskId) { //限流校验 // AccessLimitUtils.validate("generateSketchOrPrint", 5); OkHttpClient client = new OkHttpClient().newBuilder() @@ -3405,7 +3407,7 @@ public class PythonService { if (result && jsonObject.get("code").equals(200)) { log.info("Generate##responseObject###{}", jsonObject); // return setGenerateImageList(jsonObject.getJSONObject("data")); - if (servicePath== CommonConstant.GENERATE_PATH_FLUX2_KLEIN){ + if (servicePath == CommonConstant.GENERATE_PATH_FLUX2_KLEIN) { //放入结果到mq JSONObject data = jsonObject.getJSONObject("data"); String outputPath = data.getString("output_path"); @@ -4172,6 +4174,9 @@ public class PythonService { .writeTimeout(60, TimeUnit.SECONDS) .build(); MediaType mediaType = MediaType.parse("application/json"); + content.put("bucket", userBucketName); + content.put("object_name", content.get("user_id") + "/" + "segment" + "/" + UUID.randomUUID() + ".png"); + content.remove("user_id"); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content)); String url = accessPythonIp + ":" + accessPythonPort + "/api/seg_anything"; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index ff860531..d23c7b6b 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1553,6 +1553,13 @@ public class GenerateServiceImpl extends ServiceImpl i if (imagePath != null) { requestBuilder.image(finalImagePath1); } + if (useModel.equals(ModelConstants.PRINTBOARD_HIGH_I2I)) { + GenerateImagesRequest.OptimizePromptOptions optimizePromptOptions = new GenerateImagesRequest.OptimizePromptOptions(); + optimizePromptOptions.setMode("fast"); + requestBuilder.optimizePromptOptions(optimizePromptOptions); + //由于PRINTBOARD_HIGH_I2I与PRINTBOARD_ADVANCED_I2I使用模型一致,为了区别积分扣除,PRINTBOARD_HIGH_I2I加入了-fast,但传入模型时需要去掉-fast,用PRINTBOARD_ADVANCED_I2I的常量做替代 + requestBuilder.model(ModelConstants.PRINTBOARD_ADVANCED_I2I); + } // 保存生成记录到数据库 Generate generate = new Generate(