feat: 식재로 인식 API 구현

lyouxsun · lyouxsun · commit 697224931bfb · 2025-06-11T14:12:55.000+09:00
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -1,4 +1,4 @@
-name: RecipAI CD with Gradle and Docker
+name: RecipAI CI/CD with Gradle and Docker
 
 on:
   push:
diff --git a/src/main/java/com/recipAI/server/common/response/BaseResponseStatus.java b/src/main/java/com/recipAI/server/common/response/BaseResponseStatus.java
@@ -39,6 +39,7 @@ public enum BaseResponseStatus {
     INVALID_API_KEY(3006, HttpStatus.UNAUTHORIZED, "OPEN AI API 키 형식이 유효하지 않습니다."),
     MISSING_API_KEY(3007, HttpStatus.UNAUTHORIZED, "요청 헤더에 API 키가 포함되지 않았습니다."),
     INSUFFICIENT_QUOTA(3008, HttpStatus.UNAUTHORIZED, "사용자의 API 크레딧 또는 사용량을 초과했습니다."),
+    UNRECOGNIZED_DISH(3009, HttpStatus.BAD_REQUEST, "인식할 수 없는 요리 이름입니다."),
 
 
     //- 3000번대 : DB 관련 코드
diff --git a/src/main/java/com/recipAI/server/common/s3/S3Service.java b/src/main/java/com/recipAI/server/common/s3/S3Service.java
@@ -31,7 +31,7 @@ public class S3Service {
     @Value("${cloud.aws.s3.bucket}")
     private String bucketName;
 
-    private final String DIR_NAME = "/ingredients";
+    private final String DIR_NAME = "ingredients";
 
     public String uploadImage(MultipartFile multipartFile) throws IOException {
         log.info("[uploadImage] 이미지 업로드 요청");
diff --git a/src/main/java/com/recipAI/server/common/utils/GptResponseParser.java b/src/main/java/com/recipAI/server/common/utils/GptResponseParser.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import java.util.List;
+
 public class GptResponseParser {
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
@@ -20,4 +22,15 @@ public static String extractMessageContent(String rawJson) {
         }
     }
 
+    public static List<String> parseIngredients(String gptResponse) {
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode root = mapper.readTree(gptResponse);
+            String content = root.path("choices").get(0).path("message").path("content").asText();
+            return mapper.readValue(content, List.class);
+        } catch (Exception e) {
+            throw new RuntimeException("GPT 응답 파싱 실패: " + gptResponse, e);
+        }
+    }
+
 }
diff --git a/src/main/java/com/recipAI/server/domain/chat/ChatController.java b/src/main/java/com/recipAI/server/domain/chat/ChatController.java
@@ -5,6 +5,7 @@
 import com.recipAI.server.domain.chat.dto.IngredientsResponse;
 import com.recipAI.server.domain.chat.dto.IngredientsStringRequest;
 import com.recipAI.server.domain.chat.dto.MenusResponse;
+import com.recipAI.server.domain.chat.dto.RecipeResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -27,24 +28,11 @@ public class ChatController {
     private final ChatService chatService;
 
     @PostMapping("/ingredients")
-    public ResponseEntity<IngredientsResponse> detectIngredients(@RequestPart("images") List<MultipartFile> uploadImages) {
+    public ResponseEntity<IngredientsResponse> detectIngredients(@RequestPart("image") MultipartFile image) {
         log.info("[detectIngredients] 재료 이미지 요청");
-//        List<String> imageUrls = uploadImages.stream()
-//                .map(this::uploadImage)
-//                .peek(imageUrl -> log.debug("[detectIngredients] imageUrl = {}", imageUrl))
-//                .toString();
-        List<String> encodedImages = uploadImages.stream()
-                .map(image -> {
-                    try {
-                        String base64Image = toBase64DataUrl(image);
-                        log.info("[detectIngredients] base64Image size = {} Byte", image.getSize());
-                        return base64Image;
-                    } catch (IOException e) {
-                        throw new RecipAIException(IMAGE_UPLOAD_FAIL);
-                    }
-                })
-                .toList();
-        IngredientsResponse response = chatService.requestIngredients(encodedImages);
+        String imageUrl = uploadImage(image);
+        log.info("[detectIngredients] imageUrl = {}", imageUrl);
+        IngredientsResponse response = chatService.requestIngredients(imageUrl);
         return ResponseEntity.ok(response);
     }
 
@@ -56,6 +44,14 @@ public ResponseEntity<MenusResponse> getMenus(@RequestBody List<String> ingredie
         return ResponseEntity.ok(response);
     }
 
+    @PostMapping("/recipe")
+    public ResponseEntity<RecipeResponse> getRecipe(@RequestBody String menuName) {
+        log.info("[getRecipe] 사용자가 선택한 메뉴의 레시피 요청. 메뉴 이름 = {}", menuName);
+        RecipeResponse response = chatService.requestRecipe(menuName);
+        log.info("[getRecipe] GPT 응답 = {}", response);
+        return ResponseEntity.ok(response);
+    }
+
     private String uploadImage(MultipartFile image) throws RecipAIException {
         try {
             return s3Service.uploadImage(image);
diff --git a/src/main/java/com/recipAI/server/domain/chat/ChatService.java b/src/main/java/com/recipAI/server/domain/chat/ChatService.java
@@ -5,6 +5,8 @@
 import com.recipAI.server.common.exception.RecipAIException;
 import com.recipAI.server.domain.chat.dto.IngredientsResponse;
 import com.recipAI.server.domain.chat.dto.MenusResponse;
+import com.recipAI.server.domain.chat.dto.prompt.RecipeRequest;
+import com.recipAI.server.domain.chat.dto.RecipeResponse;
 import com.recipAI.server.domain.chat.dto.prompt.IngredientsImageRequest;
 import com.recipAI.server.domain.chat.dto.prompt.MenusRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +23,7 @@
 
 import static com.recipAI.server.common.response.BaseResponseStatus.*;
 import static com.recipAI.server.common.utils.GptResponseParser.extractMessageContent;
+import static com.recipAI.server.common.utils.GptResponseParser.parseIngredients;
 import static com.recipAI.server.common.utils.Serializer.serializeObject;
 
 @Slf4j
@@ -43,11 +46,12 @@ public ChatService(RestClient.Builder builder, ObjectMapper objectMapper, Enviro
         this.objectMapper = objectMapper;
     }
 
-    public IngredientsResponse requestIngredients(List<String> encodedImages) {
-        IngredientsImageRequest request = new IngredientsImageRequest(OPENAI_MODEL, encodedImages);
+    public IngredientsResponse requestIngredients(String imageUrl) {
+        IngredientsImageRequest request = new IngredientsImageRequest(OPENAI_MODEL, imageUrl);
         log.info("[requestIngredients] IngredientsRequest = {}", request.toString());
-        String GptResponse = callGpt(request);
-        return new IngredientsResponse(GptResponse);
+        List<String> ingredients = parseIngredients(callGpt(request));
+        log.info("[requestIngredients] ingredients = {}", ingredients.toString());
+        return new IngredientsResponse(ingredients);
     }
 
     public MenusResponse requestMenus(List<String> ingredients) {
@@ -59,6 +63,18 @@ public MenusResponse requestMenus(List<String> ingredients) {
     }
 
 
+    public RecipeResponse requestRecipe(String menuName) {
+        RecipeRequest request = new RecipeRequest(OPENAI_MODEL, menuName);
+        log.info("[requestRecipe] RecipeRequest = {}", request.toString());
+        String gptResponse = extractMessageContent(callGpt(request));
+        log.info("[requestRecipe] GPT가 준 응답 = {}", gptResponse);
+        if (gptResponse.trim().equalsIgnoreCase("UnrecognizedDishException")) {
+            throw new RecipAIException(UNRECOGNIZED_DISH);
+        }
+        return new RecipeResponse(gptResponse);
+    }
+
+
     private <T> String callGpt(T request) {
         log.info("[OpenAI Request] Body = {}", serializeObject(request));
         try {
@@ -124,4 +140,5 @@ private RecipAIException handleGptException(HttpClientErrorException e) {
             throw new RecipAIException(INVALID_REQUEST_ERROR);
         }
     }
+
 }
diff --git a/src/main/java/com/recipAI/server/domain/chat/dto/IngredientsResponse.java b/src/main/java/com/recipAI/server/domain/chat/dto/IngredientsResponse.java
@@ -1,23 +1,6 @@
 package com.recipAI.server.domain.chat.dto;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.List;
 
-@Getter
-@Setter
-public class IngredientsResponse {
-    private final List<String> ingredients;
-
-    public IngredientsResponse(String gptResponse) {
-        try {
-            ObjectMapper objectMapper = new ObjectMapper();
-            this.ingredients = objectMapper.readValue(gptResponse, new TypeReference<List<String>>() {});
-        } catch (Exception e) {
-            throw new RuntimeException("GPT 응답 파싱 실패: " + gptResponse, e);
-        }
-    }
+public record IngredientsResponse(List<String> ingredients) {
 }
diff --git a/src/main/java/com/recipAI/server/domain/chat/dto/RecipeResponse.java b/src/main/java/com/recipAI/server/domain/chat/dto/RecipeResponse.java
@@ -0,0 +1,43 @@
+package com.recipAI.server.domain.chat.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@ToString
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class RecipeResponse {
+    private List<String> recipe;
+    private List<String> youtube;
+
+    public RecipeResponse(String gptResponse) {
+        parseGptResponse(gptResponse);
+    }
+
+    private void parseGptResponse(String gptResponse) {
+        try {
+            String jsonPart = gptResponse.substring(gptResponse.indexOf("{"));
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode root = objectMapper.readTree(jsonPart);
+
+            this.recipe = new ArrayList<>();
+            root.get("recipe").forEach(step -> this.recipe.add(step.asText()));
+
+            this.youtube = new ArrayList<>();
+            root.get("youtube").forEach(link -> this.youtube.add(link.asText()));
+        } catch (Exception e) {
+            log.error("응답 파싱 중 오류 발생", e);
+            throw new RuntimeException("응답 파싱 중 오류 발생", e);
+        }
+    }
+}
diff --git a/src/main/java/com/recipAI/server/domain/chat/dto/prompt/Content.java b/src/main/java/com/recipAI/server/domain/chat/dto/prompt/Content.java
@@ -1,8 +1,10 @@
 package com.recipAI.server.domain.chat.dto.prompt;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.ToString;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @ToString
 @Getter
 public class Content {
@@ -20,10 +22,5 @@ public Content(String type, ImageUrl image_url) {
         this.image_url = image_url;
     }
 
-    public record ImageUrl(String url) {
-        @Override
-        public String toString() {
-            return "이미지url";
-        }
-    }
+    public record ImageUrl(String url) {}
 }
diff --git a/src/main/java/com/recipAI/server/domain/chat/dto/prompt/IngredientsImageRequest.java b/src/main/java/com/recipAI/server/domain/chat/dto/prompt/IngredientsImageRequest.java
@@ -16,15 +16,13 @@ public class IngredientsImageRequest {
     private final String model;
     private final List<Message> messages;
 
-    public IngredientsImageRequest(String model, List<String> encodedImages) {
+    public IngredientsImageRequest(String model, String imageUrl) {
         this.model = model;
         List<Content> contents = new ArrayList<>();
         contents.add(new Content("text", "첨부한 이미지에 보이는 재료들을 JSON 배열 형식의 리스트로만 반환해줘.  \n" +
                 "설명이나 문장 없이, 예를 들어 [\"사과\", \"연어\", \"브로콜리\"] 형식으로 응답해줘."));
-        for (String imageUrl : encodedImages) {
-            log.info("[IngredientsRequest] imageUrl = {}", imageUrl);
-            contents.add(new Content("image_url", new ImageUrl(imageUrl)));
-        }
+        log.info("[IngredientsRequest] imageUrl = {}", imageUrl);
+        contents.add(new Content("image_url", new ImageUrl(imageUrl)));
         this.messages = List.of(new Message("user", contents));
     }
-}
+}
diff --git a/src/main/java/com/recipAI/server/domain/chat/dto/prompt/RecipeRequest.java b/src/main/java/com/recipAI/server/domain/chat/dto/prompt/RecipeRequest.java
@@ -0,0 +1,35 @@
+package com.recipAI.server.domain.chat.dto.prompt;
+
+import lombok.Getter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@ToString
+@Getter
+public class RecipeRequest {
+
+    private final String model;
+    private final List<Message> messages;
+
+    public RecipeRequest(String model, String menuName) {
+        this.model = model;
+        List<Content> contents = new ArrayList<>();
+        String prompt = "다음 문자열은 요리 메뉴 이름일 수도 있고 아닐 수도 있어: \"" + menuName + "\".\n" +
+                "만약 요리 이름이 아니라면, \"UnrecognizedDishException\" 이라고만 응답해줘. 다른 설명은 절대 하지 마.\n" +
+                "반대로 이 문자열이 실제 요리 메뉴 이름이라면, 해당 요리를 만드는 과정을 번호를 붙여 단계별로 설명해줘.\n" +
+                "그리고 해당 요리법이 잘 설명된 유튜브 링크 3개도 함께 제공해줘.\n" +
+                "최종 응답은 아래 형식의 순수 JSON 객체여야 해. 설명 없이 반드시 이 형식만 따르도록 해:\n" +
+                "{\n" +
+                "  \"recipe\": [\"1. 첫 번째 단계\", \"2. 두 번째 단계\", ...],\n" +
+                "  \"youtube\": [\"유튜브 링크1\", \"유튜브 링크2\", \"유튜브 링크3\"]\n" +
+                "}";
+        contents.add(new Content("text", prompt));
+//        contents.add(new Content("text", menuName));
+
+        this.messages = List.of(new Message("user", contents));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: RecipAI CD with Gradle and Docker`
	`1`	`+name: RecipAI CI/CD with Gradle and Docker`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`