From b5a9cae32a275028bf97723e499a93891027cb83 Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Fri, 13 Jun 2025 16:57:35 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=99=8D=EB=B3=B4=20=ED=8F=AC?= =?UTF-8?q?=EC=8A=A4=ED=84=B0=20=EC=83=9D=EC=84=B1=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EB=B2=84=EC=A0=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smarketing-ai/app.py | 39 +++++++++++++++++++------- smarketing-ai/config/config.py | 6 +++- smarketing-ai/models/request_models.py | 9 +++--- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/smarketing-ai/app.py b/smarketing-ai/app.py index 05754aa..6a4b9d4 100644 --- a/smarketing-ai/app.py +++ b/smarketing-ai/app.py @@ -12,7 +12,7 @@ from config.config import Config from services.poster_service import PosterService from services.sns_content_service import SnsContentService from models.request_models import ContentRequest, PosterRequest, SnsContentGetRequest, PosterContentGetRequest -from services.poster_service_v2 import PosterServiceV2 +from services.poster_service_v3 import PosterServiceV3 def create_app(): @@ -30,7 +30,7 @@ def create_app(): # 서비스 인스턴스 생성 poster_service = PosterService() - poster_service_v2 = PosterServiceV2() + poster_service_v3 = PosterServiceV3() sns_content_service = SnsContentService() @app.route('/health', methods=['GET']) @@ -97,8 +97,8 @@ def create_app(): @app.route('/api/ai/poster', methods=['GET']) def generate_poster_content(): """ - 홍보 포스터 생성 API (개선된 버전) - 원본 이미지 보존 + 한글 텍스트 오버레이 + 홍보 포스터 생성 API + 실제 제품 이미지를 포함한 분위기 배경 포스터 생성 """ try: # JSON 요청 데이터 검증 @@ -115,6 +115,23 @@ def create_app(): if field not in data: return jsonify({'error': f'필수 필드가 누락되었습니다: {field}'}), 400 + # 날짜 변환 처리 + start_date = None + end_date = None + if data.get('startDate'): + try: + from datetime import datetime + start_date = datetime.strptime(data['startDate'], '%Y-%m-%d').date() + except ValueError: + return jsonify({'error': 'startDate 형식이 올바르지 않습니다. YYYY-MM-DD 형식을 사용하세요.'}), 400 + + if data.get('endDate'): + try: + from datetime import datetime + end_date = datetime.strptime(data['endDate'], '%Y-%m-%d').date() + except ValueError: + return jsonify({'error': 'endDate 형식이 올바르지 않습니다. YYYY-MM-DD 형식을 사용하세요.'}), 400 + # 요청 모델 생성 poster_request = PosterContentGetRequest( title=data.get('title'), @@ -127,16 +144,18 @@ def create_app(): emotionIntensity=data.get('emotionIntensity'), menuName=data.get('menuName'), eventName=data.get('eventName'), - startDate=data.get('startDate'), - endDate=data.get('endDate') + startDate=start_date, + endDate=end_date ) - # 포스터 생성 - # result = poster_service.generate_poster(poster_request) - result = poster_service_v2.generate_poster(poster_request) + # 포스터 생성 (V3 사용) + result = poster_service_v3.generate_poster(poster_request) if result['success']: - return jsonify({'content': result['content']}) + return jsonify({ + 'content': result['content'], + 'analysis': result.get('analysis', {}) + }) else: return jsonify({'error': result['error']}), 500 diff --git a/smarketing-ai/config/config.py b/smarketing-ai/config/config.py index de6f276..6b63540 100644 --- a/smarketing-ai/config/config.py +++ b/smarketing-ai/config/config.py @@ -4,7 +4,10 @@ Flask 애플리케이션 설정 """ import os from dotenv import load_dotenv + load_dotenv() + + class Config: """애플리케이션 설정 클래스""" # Flask 기본 설정 @@ -19,8 +22,9 @@ class Config: ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif', 'webp'} # 템플릿 설정 POSTER_TEMPLATE_PATH = 'templates/poster_templates' + @staticmethod def allowed_file(filename): """업로드 파일 확장자 검증""" return '.' in filename and \ - filename.rsplit('.', 1)[1].lower() in Config.ALLOWED_EXTENSIONS \ No newline at end of file + filename.rsplit('.', 1)[1].lower() in Config.ALLOWED_EXTENSIONS diff --git a/smarketing-ai/models/request_models.py b/smarketing-ai/models/request_models.py index b47b257..653dfb8 100644 --- a/smarketing-ai/models/request_models.py +++ b/smarketing-ai/models/request_models.py @@ -4,6 +4,7 @@ API 요청 데이터 구조를 정의 """ from dataclasses import dataclass from typing import List, Optional +from datetime import date @dataclass @@ -19,8 +20,8 @@ class SnsContentGetRequest: emotionIntensity: Optional[str] = None menuName: Optional[str] = None eventName: Optional[str] = None - startDate: Optional[str] = None - endDate: Optional[str] = None + startDate: Optional[date] = None # LocalDate -> date + endDate: Optional[date] = None # LocalDate -> date @dataclass @@ -36,8 +37,8 @@ class PosterContentGetRequest: emotionIntensity: Optional[str] = None menuName: Optional[str] = None eventName: Optional[str] = None - startDate: Optional[str] = None - endDate: Optional[str] = None + startDate: Optional[date] = None # LocalDate -> date + endDate: Optional[date] = None # LocalDate -> date # 기존 모델들은 유지