Merge pull request #8 from SKT-FlyAI-BoraMettugi/dev

Final merge

Author: hanseul37

.github/workflows/deploy.yml

@@ -31,6 +31,11 @@ jobs:
         echo "REDIS_URL=${{ secrets.REDIS_URL }}" >> .env
         echo "KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}" >> .env
         echo "KAKAO_REDIRECT_URI=${{ secrets.KAKAO_REDIRECT_URI }}" >> .env
+        echo "MINIO_USER=${{ secrets.MINIO_USER }}" >> .env
+        echo "MINIO_PASSWORD=${{ secrets.MINIO_PASSWORD }}" >> .env
+        echo "MINIO_HOST=${{ secrets.MINIO_HOST }}" >> .env
+        echo "S3_BUCKET_NAME=${{ secrets.S3_BUCKET_NAME }}" >> .env
+        
         
     - name: Generate deployment package
       run: zip -r deploy.zip . -x '*.git*' '*.github*' 'venv/*' '__pycache__/*'

.gitignore

@@ -6,4 +6,6 @@ __pycache__
 *.bin
 .idea/
 venv/
-main_my.py
+main_my.py
+test_download/
+downloaded_model/

api/routes/answer.py

@@ -2,7 +2,13 @@
 from sqlalchemy.orm import Session
 from database.nolly import get_db
 from crud.answer import get_answer_history, get_answer_scores
-from schemas.answer import AnswerResponse, AnswerScoreResponse
+from schemas.answer import AnswerResponse, AnswerScoreResponse, AnswerSubmit
+from dependencies import get_tokenizer, get_model
+from models.question import Question 
+from models.answer import Answer
+import torch
+import json
+import re
 
 router = APIRouter()
 
@@ -22,4 +28,133 @@ async def get_answer_scores_api(user_id: int, question_id: int, db: Session = De
     if not answer_scores:
         raise HTTPException(status_code=404, detail="채점 결과를 찾을 수 없습니다.")
 
-    return answer_scores
+    return answer_scores
+
+@router.post("grade/{user_id}/{question_id}")
+async def grade_answers(
+    user_id: int, question_id: int, 
+    answer_data: AnswerSubmit, tokenizer = Depends(get_tokenizer), model = Depends(get_model), 
+    db: Session = Depends(get_db) 
+):
+    question = db.query(Question).filter(
+        Question.question_id == question_id
+    ).first()
+
+    if not question:
+        raise HTTPException(status_code=404, detail="해당 문제를 찾을 수 없습니다.")
+
+    description = question.description  # 문제 설명
+
+    # ✅ 패딩 토큰 명확하게 설정 (경고 방지)
+    if tokenizer.pad_token is None:
+        tokenizer.pad_token = tokenizer.eos_token
+
+    # 1. 사용자 답변 불러오기 (JSON 출력을 강제하는 프롬프트 추가)
+    input_text = [
+        {"role": "system", "content": """답변을 다음 항목으로 나누어 JSON 형식으로 평가해 주세요.
+        반드시 JSON 객체 하나로 반환하세요.
+        예시:
+        {
+            "논리력": {"점수": 8, "해설": "설명이 논리적입니다."},
+            "사고력": {"점수": 7, "해설": "분석력이 뛰어납니다."},
+            "창의력": {"점수": 9, "해설": "새로운 아이디어가 포함되었습니다."},
+            "설득력": {"점수": 6, "해설": "설명이 명확합니다."},
+            "추론의 깊이": {"점수": 7, "해설": "근거가 논리적입니다."}
+        }
+        """.strip()},
+        {"role": "assistant", "content": f"{description}"},
+        {"role": "user", "content": f"{answer_data.answer}"}
+    ]
+
+    # 2. 모델에 넣을 수 있도록 토큰화
+    inputs = tokenizer.apply_chat_template(
+        input_text,
+        add_generation_prompt=True,
+        return_tensors="pt",
+        padding=True,
+        truncation=True
+    ).to(model.device)
+
+    terminators = [
+        tokenizer.convert_tokens_to_ids("<|end_of_text|>"),
+        tokenizer.convert_tokens_to_ids("<|eot_id|>")
+    ]
+
+    # 3. 모델 추론 수행
+    outputs = model.generate(
+        inputs,
+        max_new_tokens=1024,
+        pad_token_id=tokenizer.pad_token_id,
+        eos_token_id=tokenizer.eos_token_id,
+        do_sample=True,
+        temperature=0.6,
+        top_p=0.9
+    )
+
+    # 4. 모델 결과 디코딩
+    generated_text = tokenizer.decode(outputs[:, inputs.shape[1]:][0], skip_special_tokens=True)
+    print("🔍 모델 생성 결과:", generated_text)
+
+    # ✅ JSON 자동 보정 (불완전한 JSON을 수정)
+    try:
+        # 1️⃣ JSON 내부 개별 `{}` 블록을 하나의 JSON 객체로 병합
+        json_str = re.sub(r"}\s*{", "},{", generated_text.strip())  # 중괄호 사이 개행 문제 수정
+        json_str = f"{{{json_str.strip()}}}" if not json_str.startswith("{") else json_str  # 중괄호 감싸기
+        json_str = json_str.replace("\n", "").replace("\t", "")  # 불필요한 줄바꿈 제거
+        json_str = re.sub(r",\s*}", "}", json_str)  # 마지막 쉼표 제거
+
+        result = json.loads(json_str)  # JSON 변환
+
+    except json.JSONDecodeError:
+        raise HTTPException(status_code=500, detail=f"모델 응답을 JSON으로 변환하는데 실패했습니다. 출력된 텍스트: {generated_text}")
+
+    # 5. 점수와 리뷰 추출
+    scores = [
+        result.get("논리력", {}).get("점수", 0),
+        result.get("사고력", {}).get("점수", 0),
+        result.get("창의력", {}).get("점수", 0),
+        result.get("설득력", {}).get("점수", 0),
+        result.get("추론의 깊이", {}).get("점수", 0)
+    ]
+
+    reviews = [
+        result.get("논리력", {}).get("해설", ""),
+        result.get("사고력", {}).get("해설", ""),
+        result.get("창의력", {}).get("해설", ""),
+        result.get("설득력", {}).get("해설", ""),
+        result.get("추론의 깊이", {}).get("해설", "")
+    ]
+
+    total_score = sum(scores) / len(scores) if scores else 0
+
+    # 6. DB 저장
+    existing_answer = db.query(Answer).filter(
+        Answer.user_id == user_id, 
+        Answer.question_id == question_id
+    ).first()
+
+    if existing_answer:
+        existing_answer.content = answer_data.answer
+        existing_answer.creativity = scores[2]
+        existing_answer.logic = scores[0]
+        existing_answer.thinking = scores[1]
+        existing_answer.persuasion = scores[3]
+        existing_answer.depth = scores[4]
+        existing_answer.creativity_review = reviews[2]
+        existing_answer.logic_review = reviews[0]
+        existing_answer.thinking_review = reviews[1]
+        existing_answer.persuasion_review = reviews[3]
+        existing_answer.depth_review = reviews[4]
+        existing_answer.total_score = total_score
+    else:
+        db.add(Answer(
+            user_id=user_id, question_id=question_id, content=answer_data.answer,
+            creativity=scores[2], logic=scores[0], thinking=scores[1],
+            persuasion=scores[3], depth=scores[4],
+            creativity_review=reviews[2], logic_review=reviews[0],
+            thinking_review=reviews[1], persuasion_review=reviews[3], depth_review=reviews[4],
+            total_score=total_score
+        ))
+
+    db.commit()
+    return {"message":"답변 제출 완료"}

api/routes/comment.py

@@ -1,8 +1,9 @@
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from database.nolly import get_db
-from crud.comment import create_comment, add_like_to_comment
+from crud.comment import create_comment, add_like_to_comment, get_liked_comments_by_user, get_comments_by_discussion_id
 from schemas.comment import CommentCreate, CommentResponse, CommentLikeResponse
+from typing import List
 
 router = APIRouter()
 
@@ -16,4 +17,19 @@ async def post_comment(user_id: int, discussion_id: int, comment_data: CommentCr
 @router.patch("/like/{comment_id}/{user_id}", response_model=CommentLikeResponse)
 async def like_comment(comment_id: int, user_id: int, db: Session = Depends(get_db)):
     comment = add_like_to_comment(db, comment_id, user_id)
-    return comment
+    return comment
+
+# 좋아요 누른 답글 조회
+@router.get("/like/{user_id}")
+async def get_liked_comments(user_id: int, db: Session = Depends(get_db)):
+    return get_liked_comments_by_user(db, user_id)
+
+# 토론에 대한 모든 답글 조회
+@router.get("/{discussion_id}", response_model=List[CommentResponse])
+async def get_comments(discussion_id: int, db: Session = Depends(get_db)):
+    comments = get_comments_by_discussion_id(db, discussion_id)
+
+    if not comments:
+        raise HTTPException(status_code=404, detail="해당 토론에 대한 답글이 없습니다.")
+
+    return comments

api/routes/discussion.py

@@ -1,8 +1,9 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from database.nolly import get_db
-from crud.discussion import create_discussion, get_discussions_by_question, add_like_to_discussion
+from crud.discussion import create_discussion, get_discussions_by_question, add_like_to_discussion, get_liked_discussions_by_user
 from schemas.discussion import DiscussionCreate, DiscussionResponse, DiscussionLikeResponse
+from typing import List
 
 router = APIRouter()
 
@@ -28,4 +29,13 @@ async def like_discussion(discussion_id: int, user_id: int, db: Session = Depend
     result = add_like_to_discussion(db, discussion_id, user_id)
     return result
 
+# 좋아요 누른 토론 조회
+@router.get("/like/{user_id}", response_model=List[DiscussionResponse])
+async def get_liked_discussions(user_id: int, db: Session = Depends(get_db)):
+    liked_discussions = get_liked_discussions_by_user(db, user_id)
+
+    if not liked_discussions:
+        raise HTTPException(status_code=404, detail="좋아요 누른 토론이 없습니다.")
+
+    return liked_discussions
 

api/routes/question.py

@@ -21,4 +21,6 @@ async def get_question(question_id: int, db: Session = Depends(get_db)):
     if not question:
         raise HTTPException(status_code=404, detail="해당 문제를 찾을 수 없습니다.")
 
-    return question
+    return question
+
+

api/routes/user.py

@@ -1,14 +1,23 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 from database.nolly import get_db
-from crud.user import get_user_info, update_user_nickname, update_kakao_login, logout_kakao_user
+from crud.user import get_user_info, update_user_nickname, get_user_by_kakao_id, create_user, update_kakao_login, logout_kakao_user, get_all_users
 from schemas.nickname import Nickname
 from schemas.login import KakaoLoginRequest
+from schemas.user import UserResponse
+from typing import List
 from core.kakao_api import KakaoAPI
+import random
 
 router = APIRouter()
 kakao_api = KakaoAPI()
 
+# 전체 유저 조회
+@router.get("/all", response_model=List[UserResponse])
+async def get_all_users_api(db: Session = Depends(get_db)):
+    users = get_all_users(db)
+    return users
+
 @router.get("/{user_id}")
 async def get_user(user_id: int, db: Session = Depends(get_db)):
     user = get_user_info(user_id, db)
@@ -19,42 +28,25 @@ async def update_nickname(nickname: Nickname, db: Session = Depends(get_db)):
     update_user_nickname(nickname, db)
     return nickname
 
-# user 생성 
-
-# 카카오 로그인 url 반환
-@router.get("/auth/kakao/login-url")
-def get_kakao_login_url():
-    return {"login_url": kakao_api.get_auth_url()}
-
-# 카카오 로그인 후 받은 code를 JSON으로 반환
-@router.get("/auth/kakao/callback")
-async def kakao_callback(code: str):
-    return {"code": code}
-
 # 프론트에서 code 보냄
-@router.patch("/login/{user_id}")
-async def kakao_login(user_id: int, request: KakaoLoginRequest, db: Session = Depends(get_db)):
-    
-    # 인가 코드로 카카오에서 액세스 토큰 요청
-    token_data = await kakao_api.get_access_token(request.code)
-    access_token = token_data.get("access_token")
-    print(" 액세스 토큰:", access_token)
+@router.patch("/login")
+async def kakao_login(request: KakaoLoginRequest, db: Session = Depends(get_db)):
+    kakao_id = request.kakao_id
+    nickname = request.nickname
+    profile_image = request.profile_img
 
-    if not access_token:
-        raise HTTPException(status_code=400, detail="카카오 액세스 토큰 발급 실패")
+    # DB에서 기존 유저 확인
+    user = get_user_by_kakao_id(db, kakao_id)
 
-    # 액세스 토큰으로 사용자 정보 요청
-    user_data = await kakao_api.get_user_info(access_token)
-    kakao_id = user_data["id"]
-    nickname = user_data["kakao_account"]["profile"].get("nickname", "No Nickname")
-    profile_image = user_data["kakao_account"]["profile"].get("profile_image_url", None)    
-    # DB 업데이트 수행
-    db_user = update_kakao_login(db, user_id, access_token, nickname, profile_image)
+    if user:
+        # 기존 유저: 로그인 처리 
+        update_kakao_login(db, user.user_id, None, nickname, profile_image)
+        return {"message": "카카오 로그인 성공", "user_id": user.user_id, "nickname": nickname}
 
-    if not db_user:
-        raise HTTPException(status_code=404, detail="User not found")
+    # 신규 유저: 회원가입 후 로그인 처리
+    new_user = create_user(db, kakao_id, nickname, profile_image, None)
 
-    return {"message": "카카오 로그인 성공", "user_id": user_id, "nickname": nickname}
+    return {"message": "회원가입 및 로그인 성공", "user_id": new_user.user_id, "nickname": nickname}
 
 # 카카오 로그아웃
 @router.patch("/logout/{user_id}")

core/kakao_api.py

@@ -4,7 +4,7 @@
 from dotenv import load_dotenv
 
 # 환경 변수 로드
-load_dotenv(override=True)
+load_dotenv()
 
 class KakaoAPI:
     def __init__(self):
@@ -14,45 +14,6 @@ def __init__(self):
         self.kakao_token_url = "https://kauth.kakao.com/oauth/token"
         self.kakao_user_info_url = "https://kapi.kakao.com/v2/user/me"
 
-    # 카카오 로그인 url 생성 
-    def get_auth_url(self):
-        return {
-             f"{self.kakao_auth_url}?response_type=code"
-             f"&client_id={self.client_id}"
-             f"&redirect_uri={self.redirect_uri}"
-        }
-    # 인가 코드로 액세스 토큰 요청
-    async def get_access_token(self, code: str):
-        async with httpx.AsyncClient() as client:
-            response = await client.post(
-                self.kakao_token_url,
-                data={
-                    "grant_type": "authorization_code",
-                    "client_id": self.client_id,
-                    "redirect_uri": self.redirect_uri,
-                    "code": code,
-                },
-                headers={"Content-Type": "application/x-www-form-urlencoded"},
-            )
-
-        # 🔹 카카오 API 응답 로그 출력
-        print("카카오 토큰 응답:", response.json())
-
-        # ✅ HTTP 상태 코드 체크 추가 (잘못된 응답 처리)
-        if response.status_code != 200:
-            raise HTTPException(status_code=400, detail=f"카카오 액세스 토큰 요청 실패: {response.text}")
-
-        return response.json()
-
-    # 액세스 토큰으로 사용자 정보 요청
-    async def get_user_info(self, access_token: str):
-        async with httpx.AsyncClient() as client:
-            response = await client.get(
-                self.kakao_user_info_url,
-                headers={"Authorization": f"Bearer {access_token}"},
-            )
-        return response.json()
-    
     # 카카오 로그아웃 
     async def logout_user(self, access_token: str):
         async with httpx.AsyncClient() as client: