Merge branch 'prod_aws' of https://github.com/stonylion/Backend into prod_aws

Author: 2ewyeonwoo3

Dstonylion/AI/views.py

@@ -2,6 +2,7 @@
 import os, json, base64, re, random, uuid, tempfile
 from uuid import uuid4
 from pathlib import Path
+from urllib.parse import urlparse
 
 import boto3
 from botocore.exceptions import ClientError
@@ -514,7 +515,8 @@ def get(self, request, story_id, page_id):
             return Response({"error": "해당 페이지의 삽화가 없습니다."},
                             status=status.HTTP_404_NOT_FOUND)
 
-        s3_key = illustration.image.name  # 실제 S3 내부 경로
+        file_url = illustration.image.url
+        s3_key = s3_key = urlparse(file_url).path.lstrip('/')
         bucket = settings.AWS_STORAGE_BUCKET_NAME
         region = settings.AWS_S3_REGION_NAME
 
@@ -526,22 +528,26 @@ def get(self, request, story_id, page_id):
             region_name=region
         )
 
+        filename = f"story_{story_id}_page_{page_id}.png"
+
         try:
             presigned_url = s3_client.generate_presigned_url(
                 ClientMethod='get_object',
-                Params={'Bucket': bucket, 'Key': s3_key},
+                Params={'Bucket': bucket, 'Key': s3_key, 'ResponseContentDisposition': f'attachment; filename="{filename}"'},
                 ExpiresIn=60 * 10  # 10분 유효
             )
         except Exception as e:
             return Response({"error": f"URL 생성 실패: {str(e)}"},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        
+        print("DEBUG s3 key:", s3_key)
 
         return Response({
             "story_id": story_id,
             "page_id": page_id,
             "download_url": presigned_url
         }, status=200)
-
+    
 HARD_MIN_USER_TOKENS = 200
 FINALIZE_SUFFIX = "이제 결말을 확장해도 될까?"
 

Dstonylion/story/urls.py

@@ -3,7 +3,8 @@
 
 urlpatterns = [
     path('options/', StoryOptionSaveView.as_view()),
-    path("draft/", StoryDraftUpdateView.as_view()), 
+    path("draft/", StoryDraftUpdateView.as_view()),
+    path('draft_stt/', StoryDraftAudioAppendView.as_view()),
     path('morals/', MoralThemeListView.as_view()),
     path('story-morals/', StoryMoralSaveView.as_view()),
     path('story-morals/recommend/', RecommendMoralView.as_view()),

Dstonylion/story/views.py

@@ -1,11 +1,14 @@
-import redis, random, os, json, re
+import redis, random, os, json, re, tempfile
 import openai
+from openai import OpenAI
+from pathlib import Path
 from django.conf import settings
 from django.core.files import File
 from django.shortcuts import render
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.parsers import MultiPartParser, FormParser
 
 from .models import *
 from .serializers import *
@@ -28,6 +31,8 @@
 
 load_dotenv(settings.BASE_DIR/ ".env")
 # openai.api_key = os.getenv("OPENAI_API_KEY")
+OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
+client = OpenAI(api_key=OPENAI_API_KEY)
 
 User = get_user_model()
 
@@ -57,20 +62,89 @@ def post(self, request):
             port=getattr(settings, "REDIS_PORT", 6379),
             db=0,
             decode_responses=True,
-            ssl=True, 
+            ssl=False, 
         )
         redis_client.hset(f"story_option:{request.user.id}", mapping={"runtime": runtime, "age_group": age_group})
 
         return Response({"next": "/story/record/"}, status=status.HTTP_200_OK)
-    
+
+def append_draft(user_id, new_text):
+    redis_client = redis.StrictRedis(
+        host=getattr(settings, "REDIS_HOST", "localhost"),
+        port=getattr(settings, "REDIS_PORT", 6379),
+        db=0,
+        decode_responses=True,
+        ssl=False,
+    )
+
+    key = f"story_draft:{user_id}"
+    existing = redis_client.get(key) or ""
+
+    # 기존 draft 뒤에 자연스럽게 이어 붙이기
+    if existing:
+        updated = existing.rstrip() + " " + new_text.strip()
+    else:
+        updated = new_text.strip()
+
+    redis_client.set(key, updated)
+    return updated
+
+class StoryDraftAudioAppendView(APIView):
+    permission_classes = [IsAuthenticated]
+    parser_classes = [MultiPartParser, FormParser]
+
+    def post(self, request):
+        audio = request.FILES.get("audio")
+        if not audio:
+            return Response({"error": "audio 파일이 필요합니다."}, status=400)
+
+        # 1) 파일 임시 저장
+        suffix = Path(audio.name).suffix or ".mp3"
+        with tempfile.NamedTemporaryFile(suffix=suffix, delete=False) as tmp:
+            for chunk in audio.chunks():
+                tmp.write(chunk)
+            tmp_path = tmp.name
+
+        # 2) Whisper-1 호출
+        try:
+            with open(tmp_path, "rb") as f:
+                transcript = client.audio.transcriptions.create(
+                    model="whisper-1",
+                    file=f
+                )
+                text = transcript.text.strip()
+        except Exception as e:
+            return Response({"error": f"STT 실패: {str(e)}"}, status=500)
+
+        # 3) Redis draft에 append
+        redis_client = redis.StrictRedis(
+            host=getattr(settings, "REDIS_HOST", "localhost"),
+            port=getattr(settings, "REDIS_PORT", 6379),
+            db=0,
+            decode_responses=True,
+        )
+
+        key = f"story_draft:{request.user.id}"
+        existing = redis_client.get(key) or ""
+
+        updated = (existing + " " + text).strip()
+
+        redis_client.set(key, updated)
+
+        return Response({
+            "message": "음성이 변환되어 draft에 추가되었습니다.",
+            "recognized_text": text,
+            "draft": updated
+        }, status=200)
+
 class StoryDraftUpdateView(APIView):
     """
     사용자가 텍스트 입력으로 최종 입력한 내용을 Redis에 저장하는 API
     POST /api/story/draft/
     """
     permission_classes = [IsAuthenticated]
 
-    def post(self, request):
+    '''def post(self, request):
         text = request.data.get("text")
 
         if not text:
@@ -85,7 +159,7 @@ def post(self, request):
             port=getattr(settings, "REDIS_PORT", 6379),
             db=0,
             decode_responses=True,
-            ssl=True, 
+            ssl=False, 
         )
 
         redis_key = f"story_draft:{request.user.id}"
@@ -96,7 +170,38 @@ def post(self, request):
         return Response(
             {"message": "draft 업데이트 완료되었습니다."},
             status=200
+        )'''
+    
+    def put(self, request):
+        text = request.data.get("text", "").strip()
+
+        if text is None:
+            return Response({"error": "text는 필수 항목입니다."}, status=400)
+
+        redis_client = redis.StrictRedis(
+            host=getattr(settings, "REDIS_HOST", "localhost"),
+            port=getattr(settings, "REDIS_PORT", 6379),
+            db=0,
+            decode_responses=True,
+        )
+
+        redis_client.set(f"story_draft:{request.user.id}", text)
+
+        return Response({
+            "message": "Draft 전체가 저장되었습니다.",
+            "draft": text
+        }, status=200)
+    
+    def get(self, request):
+        redis_client = redis.StrictRedis(
+            host=getattr(settings, "REDIS_HOST", "localhost"),
+            port=getattr(settings, "REDIS_PORT", 6379),
+            db=0,
+            decode_responses=True,
+            ssl=False,
         )
+        draft = redis_client.get(f"story_draft:{request.user.id}") or ""
+        return Response({"draft": draft}, status=200)
 
 
 DEFAULT_MORALS = [
@@ -239,7 +344,7 @@ def post(self, request):
             port=getattr(settings, "REDIS_PORT", 6379),
             db=0,
             decode_responses=True,
-            ssl=True, 
+            ssl=False, 
         )
         user_id = request.user.id
         redis_key = f"story_morals:{user_id}"
@@ -282,7 +387,7 @@ def post(self, request):
             port=getattr(settings, "REDIS_PORT", 6379),
             db=0,
             decode_responses=True,
-            ssl=True, 
+            ssl=False, 
         )
 
         user_id = request.user.id
@@ -393,7 +498,7 @@ def post(self, request):
                 port=getattr(settings, "REDIS_PORT", 6379),
                 db=0,
                 decode_responses=True,
-                ssl=True, 
+                ssl=False, 
             )
 
             keys = [
@@ -839,7 +944,7 @@ def get(self, request):
         }
 
         return Response(response, status=200)
-    
+
 class StoryNDWReportView(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -915,4 +1020,4 @@ def post(self, request):
             "result": result,
             "rationale": rationale,
             "report": report
-        })
+        })