Skip to content

OCR 단계가 추가되면서 bodybuilder 작성 및 sql 수정 #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thkim7 merged 1 commit into from
Sep 27, 2025
Merged

OCR 단계가 추가되면서 bodybuilder 작성 및 sql 수정 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions apps/pre-processing-service/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions ...ce/src/main/java/site/icebang/domain/workflow/runner/fastapi/body/BlogRagBodyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public class BlogRagBodyBuilder implements TaskBodyBuilder {
private final ObjectMapper objectMapper;
private static final String TASK_NAME = "블로그 RAG 생성 태스크";
private static final String KEYWORD_SOURCE_TASK = "키워드 검색 태스크";
private static final String PRODUCT_SELECT_SOURCE_TASK = "상품 선택 태스크"; // 변경: S3 업로드 → 상품 선택
private static final String PRODUCT_SELECT_SOURCE_TASK = "상품 선택 태스크";
private static final String OCR_SOURCE_TASK = "이미지 OCR 태스크";

@Override
public boolean supports(String taskName) {
Expand All @@ -36,14 +37,17 @@ public ObjectNode build(Task task, Map<String, JsonNode> workflowContext) {
.map(node -> node.path("data").path("keyword"))
.ifPresent(keywordNode -> body.set("keyword", keywordNode));

// OCR 번역 결과 가져오기 (새로 추가)
Optional.ofNullable(workflowContext.get(OCR_SOURCE_TASK))
.map(node -> node.path("data").path("translation_language"))
.filter(node -> !node.isMissingNode() && !node.asText().trim().isEmpty())
.ifPresent(translationNode -> body.set("translation_language", translationNode));

// 선택된 상품 정보 가져오기
Optional.ofNullable(workflowContext.get(PRODUCT_SELECT_SOURCE_TASK))
.map(node -> node.path("data").path("selected_product"))
.ifPresent(productNode -> body.set("product_info", productNode));

// 기본 콘텐츠 설정
body.put("content_type", "review_blog");
body.put("target_length", 1000);

return body;
}
}
41 changes: 41 additions & 0 deletions ...e/src/main/java/site/icebang/domain/workflow/runner/fastapi/body/ImageOcrBodyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package site.icebang.domain.workflow.runner.fastapi.body;

import java.util.Map;
import java.util.Optional;

import org.springframework.stereotype.Component;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;

import lombok.RequiredArgsConstructor;

import site.icebang.domain.workflow.model.Task;

@Component
@RequiredArgsConstructor
public class ImageOcrBodyBuilder implements TaskBodyBuilder {

private final ObjectMapper objectMapper;
private static final String TASK_NAME = "이미지 OCR 태스크";
private static final String KEYWORD_SOURCE_TASK = "키워드 검색 태스크";

@Override
public boolean supports(String taskName) {
return TASK_NAME.equals(taskName);
}

@Override
public ObjectNode build(Task task, Map<String, JsonNode> workflowContext) {
ObjectNode body = objectMapper.createObjectNode();

// 키워드 정보 가져오기 (OCR 처리용)
Optional.ofNullable(workflowContext.get(KEYWORD_SOURCE_TASK))
.map(node -> node.path("data").path("keyword"))
.filter(node -> !node.isMissingNode() && !node.asText().trim().isEmpty())
.ifPresent(keywordNode -> body.set("keyword", keywordNode));

return body;
}
}
48 changes: 29 additions & 19 deletions apps/user-service/src/main/resources/sql/data/03-insert-workflow.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,66 +16,76 @@ DELETE FROM `workflow`;
-- 워크플로우 생성 (ID: 1)
INSERT INTO `workflow` (`id`, `name`, `description`, `created_by`, `default_config`) VALUES
(1, '상품 분석 및 블로그 자동 발행', '키워드 검색부터 상품 분석 후 블로그 발행까지의 자동화 프로세스', 1,
JSON_OBJECT('1',json_object('tag','naver'),'9',json_object('tag','blogger','blog_id', '', 'blog_pw', '')))
JSON_OBJECT('1',json_object('tag','naver'),'10',json_object('tag','blogger','blog_id', '', 'blog_pw', '')))
ON DUPLICATE KEY UPDATE
name = VALUES(name),
description = VALUES(description),
updated_at = UTC_TIMESTAMP();
-- Job 생성 (ID: 1, 2)
INSERT INTO `job` (`id`, `name`, `description`, `created_by`) VALUES
(1, '상품 분석', '키워드 검색, 상품 크롤링 및 유사도 분석 작업', 1),
(2, '블로그 콘텐츠 생성', '분석 데이터를 기반으로 RAG 콘텐츠 생성 및 발행 작업', 1)
(1, '상품 분석', '키워드 검색, 상품 크롤링, S3 업로드, OCR 처리 및 상품 선택 작업', 1),
(2, '블로그 콘텐츠 생성', 'OCR 데이터 기반 RAG 콘텐츠 생성 및 발행 작업', 1)
ON DUPLICATE KEY UPDATE name = VALUES(name), description = VALUES(description), updated_at = UTC_TIMESTAMP();

-- Task 생성 (ID: 1 ~ 9)
-- Task 생성 (ID: 1 ~ 10)
INSERT INTO `task` (`id`, `name`, `type`, `parameters`) VALUES
(1, '키워드 검색 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/keywords/search', 'method', 'POST',
'body', JSON_OBJECT('tag', 'String') -- { "tag": str }
'body', JSON_OBJECT('tag', 'String')
)),
(2, '상품 검색 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/search', 'method', 'POST',
'body', JSON_OBJECT('keyword', 'String') -- { "keyword": str }
'body', JSON_OBJECT('keyword', 'String')
)),
(3, '상품 매칭 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/match', 'method', 'POST',
'body', JSON_OBJECT( -- { keyword: str, search_results: List }
'body', JSON_OBJECT(
'keyword', 'String',
'search_results', 'List'
)
)),
(4, '상품 유사도 분석 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/similarity', 'method', 'POST',
'body', JSON_OBJECT( -- { keyword: str, matched_products: List, search_results: List }
'body', JSON_OBJECT(
'keyword', 'String',
'matched_products', 'List',
'search_results', 'List'
)
)),
(5, '상품 정보 크롤링 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/crawl', 'method', 'POST',
'body', JSON_OBJECT('product_urls', 'List') -- { "product_urls": List[str] } 수정됨
'body', JSON_OBJECT('product_urls', 'List')
)),
(6, 'S3 업로드 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/s3-upload', 'method', 'POST',
'body', JSON_OBJECT( -- { keyword: str, crawled_products: List, base_folder: str }
'body', JSON_OBJECT(
'keyword', 'String',
'crawled_products', 'List',
'base_folder', 'String'
)
)),
(7, '상품 선택 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/products/select', 'method', 'POST',
'body', JSON_OBJECT( -- { task_run_id: int, selection_criteria: str }
'body', JSON_OBJECT(
'task_run_id', 'Integer',
'selection_criteria', 'String'
)
)),
-- RAG관련 request body는 추후에 결정될 예정
(8, '블로그 RAG 생성 태스크', 'FastAPI', JSON_OBJECT('endpoint', '/blogs/rag/create', 'method', 'POST')),
(9, '블로그 발행 태스크', 'FastAPI', JSON_OBJECT(
(8, '이미지 OCR 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/blogs/ocr/extract', 'method', 'POST',
'body', JSON_OBJECT('keyword', 'String')
)),
(9, '블로그 RAG 생성 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/blogs/rag/create', 'method', 'POST',
'body', JSON_OBJECT(
'keyword', 'String',
'translation_language', 'String',
'product_info', 'Object'
)
)),
(10, '블로그 발행 태스크', 'FastAPI', JSON_OBJECT(
'endpoint', '/blogs/publish', 'method', 'POST',
'body', JSON_OBJECT( -- { tag: str, blog_id: str, ... }
'body', JSON_OBJECT(
'tag', 'String',
'blog_id', 'String',
'blog_pw', 'String',
Expand All @@ -84,7 +94,7 @@ INSERT INTO `task` (`id`, `name`, `type`, `parameters`) VALUES
'post_content', 'String',
'post_tags', 'List'
)
))
))
ON DUPLICATE KEY UPDATE name = VALUES(name), type = VALUES(type), parameters = VALUES(parameters), updated_at = UTC_TIMESTAMP();

-- ===================================================================
Expand All @@ -98,10 +108,10 @@ INSERT INTO `workflow_job` (`workflow_id`, `job_id`, `execution_order`) VALUES

-- Job-Task 연결
INSERT INTO `job_task` (`job_id`, `task_id`, `execution_order`) VALUES
-- Job 1: 상품 분석 (키워드검색 → 상품검색 → 매칭 → 유사도 → 크롤링 → S3업로드 → 상품선택)
(1, 1, 1), (1, 2, 2), (1, 3, 3), (1, 4, 4), (1, 5, 5), (1, 6, 6), (1, 7, 7),
-- Job 1: 상품 분석 (키워드검색 → 상품검색 → 매칭 → 유사도 → 크롤링 → S3업로드 → 상품선택 → OCR)
(1, 1, 1), (1, 2, 2), (1, 3, 3), (1, 4, 4), (1, 5, 5), (1, 6, 6), (1, 7, 7), (1, 8, 8),
-- Job 2: 블로그 콘텐츠 생성 (RAG생성 → 발행)
(2, 8, 1), (2, 9, 2)
(2, 9, 1), (2, 10, 2)
ON DUPLICATE KEY UPDATE execution_order = VALUES(execution_order);

-- 스케줄 설정 (매일 오전 8시)
Expand Down
Loading