Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.jni.Time;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -41,9 +42,6 @@ public class GenerateConsumer {
     @Value("${redis.key.generateExceptionMap}")
     private String exceptionMapKey;
 
-    @Value("${redis.key.resultMap}")
-    private String resultMapKey;
-
     @Value("${redis.key.generateResult}")
     private String generateResultKey;
 

src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java

@@ -10,6 +10,7 @@ public class MQConfig {
     public static final String GENERATE_EXCHANGE_FANOUT = "generate-exchange";
     //    public static final String GENERATE_QUEUE = "generate-queue-prod";
 //    public static final String GENERATE_QUEUE = "generate-queue-test";
+//     ==================================================================
 //    public static final String GENERATE_QUEUE = "generate-queue-local";
     public static final String GENERATE_QUEUE = "generate-queue-dev";
 

src/main/java/com/ai/da/python/PythonService.java

@@ -3168,4 +3168,59 @@ public class PythonService {
         return Boolean.TRUE;
     }
 
+    public String promptTranslate(String text) throws BusinessException {
+        OkHttpClient client = new OkHttpClient().newBuilder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒)
+                .readTimeout(60, TimeUnit.SECONDS)//读取超时(单位:秒)
+                .writeTimeout(60, TimeUnit.SECONDS)//写入超时(单位:秒)
+                .build();
+        MediaType mediaType = MediaType.parse("application/json");
+
+        HashMap<String, String> content = new HashMap<>();
+        content.put("text", text);
+
+        String jsonString = JSON.toJSONString(content, SerializerFeature.WriteNullStringAsEmpty);
+        RequestBody body = RequestBody.create(mediaType, jsonString);
+        Request request = new Request.Builder()
+                .url(accessPythonIp + ":" + accessPythonPort + "/api/translateToEN")
+                .method("POST", body)
+                .addHeader("Content-Type", "application/json")
+                .build();
+        Response response = null;
+        try {
+            log.info("promptTranslation请求入参content###{}", jsonString);
+            response = client.newCall(request).execute();
+        } catch (IOException ioException) {
+            log.error("PythonService##promptTranslation异常###{}", ExceptionUtil.getThrowableList(ioException));
+            return text;
+        }
+        int responseCode = response.code();
+        String bodyString;
+        try {
+            bodyString = response.body().string();
+            if (responseCode != HttpURLConnection.HTTP_OK) {
+                // 基本不会有除200以外的code
+                log.info("promptTranslation 用户输入翻译失败。 Response code " + responseCode);
+                throw new BusinessException("promptTranslation 用户输入翻译失败。 Response code " + responseCode);
+            }
+            JSONObject jsonObject = JSON.parseObject(bodyString);
+            Boolean result = JSON.parseObject(JSON.toJSONString(response)).getBoolean("successful");
+            if (result && jsonObject.get("msg").equals("OK!")) {
+                String translated = jsonObject.get("data").toString();
+                log.info("翻译或处理后的文本 ： {}", translated);
+                return translated;
+            }
+        } catch (IOException e) {
+            log.error("promptTranslation 用户输入翻译失败; error message => " + e.getMessage());
+            throw new RuntimeException(e);
+
+        } finally {
+            response.close();
+        }
+
+        log.info("promptTranslation 用户输入翻译失败，返回用户输入");
+        return text;
+    }
+
 }

src/main/java/com/ai/da/service/GenerateService.java

@@ -25,7 +25,7 @@ public interface GenerateService extends IService<Generate> {
 
     List<GenerateDetail> selectBatchByLibraryId(List<Long> libraryId);
 
-    GenerateCollectionVO getGenerateResult(String uniqueId);
+//    GenerateCollectionVO getGenerateResult(String uniqueId);
 
     List<GenerateResultVO> getGenerateResultList(List<String> taskIdList);
 

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -82,9 +82,6 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
     @Value("${redis.key.generateExceptionMap}")
     private String exceptionMapKey;
 
-    @Value("${redis.key.resultMap}")
-    private String resultMapKey;
-
     @Value("${redis.key.generateResult}")
     private String generateResultKey;
 
@@ -124,7 +121,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         String text = generateThroughImageTextDTO.getText();
         Long elementId = generateThroughImageTextDTO.getCollectionElementId();
         validateGeneraType(generate, text, elementId, generateType);
-        if (generateType.equals("text") || generateType.equals("text-image")) {
+        if (!StringUtil.isNullOrEmpty(text)) {
             text = modifyPrompt(text, generate, generateThroughImageTextDTO.getLevel1Type());
         }
 
@@ -258,24 +255,25 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
 
     private String modifyPrompt(String userInput, Generate generate, String level1Type) {
         String text = "";
+        String translated = pythonService.promptTranslate(userInput);
         switch (level1Type) {
             case "Moodboard":
-                text = userInput + ",high quality";
+                text = translated + ",high quality";
                 generate.setText(text);
                 break;
             case "Printboard":
                 if (userInput.contains("Painting Style")) {
-                    userInput = "Picasso,increased color saturation,increased glossiness," + userInput;
+                    userInput = "Picasso,increased color saturation,increased glossiness," + translated;
                 } else if (userInput.contains("Illustration Style")) {
-                    userInput = "Flat coating,romantic,soft,pencil strokes,accentuating and widening the depth of pencil strokes,paper patterns,block colors,crayons,reducing image contrast,and hand drawn painting marks," + userInput;
+                    userInput = "Flat coating,romantic,soft,pencil strokes,accentuating and widening the depth of pencil strokes,paper patterns,block colors,crayons,reducing image contrast,and hand drawn painting marks," + translated;
                 } else if (userInput.contains("Real Style")) {
-                    userInput = "Still life photography,hyper realism,3d,deepened projection,increased permutation value,increased concavity and convexity value," + userInput;
+                    userInput = "Still life photography,hyper realism,3d,deepened projection,increased permutation value,increased concavity and convexity value," + translated;
                 }
                 text = userInput + ", fabric print, high quality";
                 generate.setText(text);
                 break;
             case "Sketchboard":
-                text = "clear lines, simple outlines monochrome white vector image of " + userInput + ", no background, sketch flat, front view display, best quality, ultra-high resolution 8k";
+                text = "clear lines, simple outlines monochrome white vector image of " + translated + ", no background, sketch flat, front view display, best quality, ultra-high resolution 8k";
                 generate.setText(text);
             default:
         }
@@ -428,27 +426,9 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         Long elementId = generateThroughImageTextDTO.getCollectionElementId();
         validateGeneraType(new Generate(), text, elementId, generateType);
 
-        // 2、生成唯一id 使用uuid
+        // 2、生成唯一id 使用uuid,由于uuid重复的几率很小，故取消对uuid重复性的校验
         String uuid = UUID.randomUUID().toString();
 
-        int num = 1;
-        // 判断已经正常生成结果的uuid或正在排队的uuid中是否有相同的id
-        while ((redisUtil.isElementExistsInMap(resultMapKey, uuid) ||
-                redisUtil.isElementExistsInZSet(consumptionOrderKey, uuid))
-                && num < 10) {
-            uuid = UUID.randomUUID().toString();
-            num++;
-        }
-        // 无依据确定的数字
-        if (num > 10) {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            uuid = UUID.randomUUID().toString();
-        }
-
         ArrayList<String> taskIdList = new ArrayList<>();
         for (int i = 1; i <= 4; i++) {
             String temp = uuid;
@@ -480,7 +460,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         return redisUtil.getRank(consumptionOrderKey, uniqueId);
     }
 
-    @Override
+    /*@Override
     public GenerateCollectionVO getGenerateResult(String uniqueId) {
         // 1、判断该请求是否已经异常
         Boolean isMember = redisUtil.isElementExistsInMap(exceptionMapKey, uniqueId);
@@ -529,7 +509,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         });
 
         return new GenerateCollectionVO(generateId, null, generatedCollectionItems);
-    }
+    }*/
 
     @Override
     public List<GenerateResultVO> getGenerateResultList(List<String> taskIdList) {
@@ -579,7 +559,10 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
     public void cancelGenerate(Long userId, List<String> uniqueIdList, String timeZone) {
         // todo 取消待优化
         uniqueIdList.forEach(uniqueId -> {
-            // 1、确认当前消息是否还在排队中
+            // 1、将需要取消的唯一id加入redis，以便及时取消生成
+            redisUtil.addToSet(cancelSetKey, uniqueId);
+
+            /*// 1、确认当前消息是否还在排队中
             Boolean exists = redisUtil.isElementExistsInZSet(consumptionOrderKey, uniqueId);
             Boolean flag = Boolean.FALSE;
             if (exists) flag = redisUtil.getRank(consumptionOrderKey, uniqueId) > 1L ? Boolean.TRUE : Boolean.FALSE;
@@ -600,9 +583,17 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                     // 3、直接发送取消请求到python端
                     pythonService.cancelGenerateTask(uniqueId);
                 }
-            }
+            }*/
+
             String key = generateResultKey + ":" + uniqueId;
-            redisUtil.addToString(key, new Gson().toJson(new GenerateResultVO(uniqueId, null, null, "Cancelled")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
+            GenerateResultVO generateResultVO = new Gson().fromJson(redisUtil.getFromString(key), GenerateResultVO.class);
+            // 判断当前task的状态是不是Fail
+            if (!generateResultVO.getStatus().equals("Fail")){
+                // 2、不是，直接发送取消请求到python端
+                pythonService.cancelGenerateTask(uniqueId);
+                // 3、更改result中当前taskId的状态
+                redisUtil.addToString(key, new Gson().toJson(new GenerateResultVO(uniqueId, null, null, "Cancelled")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
+            }
 
             // 3、考虑加一张表，专门用于记录哪些用户在什么时间进行了取消操作,包括已经异常的请求
             GenerateCancel generateCancel = new GenerateCancel(userId, uniqueId, DateUtil.getByTimeZone(timeZone));

src/main/java/com/ai/da/service/impl/SuperResolutionServiceImpl.java

@@ -57,9 +57,6 @@ public class SuperResolutionServiceImpl extends ServiceImpl<TaskListMapper, Task
     @Value("${redis.key.orderForSR}")
     private String orderForSR;
 
-    @Value("${redis.key.resultMap}")
-    private String resultMapKey;
-
     @Value("${minio.bucketName.users}")
     private String usersBucket;
 
@@ -84,16 +81,8 @@ public class SuperResolutionServiceImpl extends ServiceImpl<TaskListMapper, Task
         for (SuperResolutionDTO superResolutionDTO : superResolutionDTOList) {
             // todo 校验倍率是否是2的幂次(前端已做)
 
-            // 2、生成唯一id 使用uuid
+            // 2、生成唯一id 使用uuid 由于uuid重复的几率很小很小，故这里取消验证uuid是否已存在
             String uuid = UUID.randomUUID().toString();
-            int num = 1;
-            // 判断已经正常生成结果的uuid或正在排队的uuid中是否有相同的id
-            while ((redisUtil.isElementExistsInMap(resultMapKey, uuid) ||
-                    redisUtil.isElementExistsInZSet(orderForSR, uuid))
-                    && num < 10) {
-                uuid = UUID.randomUUID().toString();
-                num++;
-            }
             uuid += "-" + accountId;
             uuidList.add(uuid);