Finished developing back-end

ice_breaking_challenge/background_task.py

@@ -1,21 +1,52 @@
-from flask import session
 import time
 import random
+import re
+
+from flask import session
+import pandas as pd
+
 from ice_breaking_challenge import model, quiz_generated, quiz_results
+from ice_breaking_challenge.google_sheets import QUESTIONS
 
-def background_task(sid, qna):
+def background_task(sid, qna: pd.DataFrame, team_size: int):
     """Session에 저장된 응답을 바탕으로 Gemma 모델을 사용한 퀴즈 생성"""
+    import time
+    start_time = time.time()
+
+    global quiz_results
     quiz_generated[sid] = False
-    generated_quizzes = generate_quiz(qna)
+    generated_quizzes = generate_quiz(qna, team_size)
     quiz_results[sid] = generated_quizzes
     # 퀴즈 생성 완료
     quiz_generated[sid] = True
 
-def generate_quiz(data):
+    end_time = time.time()
+    print(end_time - start_time)
+
+
+def sample_quizzes(data: pd.DataFrame, team_size: int):
+    questions_size = min(10 // team_size + 1, 5)
+    sample_indices: dict[str, list[str]] = dict()
+    for row in data.itertuples():
+        sample_indices[row.Index] = random.sample(['Q1', 'Q2', 'Q3', 'Q4', 'Q5'], questions_size)
+
+    sample_quizzes = []
+    for key, value in sample_indices.items():
+        for question_number in value:
+            question = QUESTIONS.iloc[0][question_number]
+            answer = data.iloc[key][question_number]
+            name = data.iloc[key]['name']
+            sample_quizzes.append([question, answer, name])
+
+    return sample_quizzes[:2]  # TODO
+
+
+def generate_quiz(data: pd.DataFrame, team_size: int):
     global model
     generated_quizzes = []
 
-    selected_data = random.sample(data, min(10, len(data)))
+    # selected_data = random.sample(data, min(10, len(data)))
+    selected_data = sample_quizzes(data, team_size)
 
     template_input="""
         <instruction>
@@ -23,18 +54,38 @@ def generate_quiz(data):
         """
     for row in selected_data:
         question, answer, name = row
-        
+
         input_text = template_input.format(question=question, answer=answer)
-        
-        response = model.generate(input_text, max_length=512)
 
+        response = model.generate(input_text, max_length=512)
+        print(response)
         lines = response.split('\n')
         lines = [line.strip() for line in lines]
-        index = lines.index('<response>')
-        question_generated = lines[index+1]
-        multiple_choice_generated = lines[index + 2]
-        answer_generated = lines[index + 3]
-        
+
+        opening_tag_counter = 0
+        line_index_to_remove = None
+        for i, line in enumerate(lines):
+            if bool(re.search('^<[^/]', line)):
+                opening_tag_counter += 1
+
+            if opening_tag_counter == 2:
+                line_index_to_remove = i
+                break
+
+        lines = lines[line_index_to_remove + 1:]
+        lines = [re.sub('<.\w+>', "", line) for line in lines]
+        lines = [line.strip() for line in lines]
+        lines = [line for line in lines if line]
+
+        print(lines)
+        print("==========================================")
+
+        question_generated = lines[0]
+        multiple_choice_generated = lines[1]
+        answer_generated = lines[2]
+
+        print(question_generated, multiple_choice_generated, answer_generated)
+        print("==========================================")
         generated_quizzes.append([name, question_generated, multiple_choice_generated, answer_generated])
 
     return generated_quizzes

ice_breaking_challenge/google_sheets.py

@@ -4,8 +4,7 @@ from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
-from googleapiclient.errors import HttpError
-from flask import session
+import pandas as pd
 
 # If modifying these scopes, delete the file token.json.
 SCOPES = ["https://www.googleapis.com/auth/spreadsheets"]
@@ -18,9 +17,26 @@ SERVICE = None
 
 MAX_ROW = 100
 
+QUESTIONS = None
+
+
+def get_range(range_name: str) -> list[list[str]]:
+    sheet = SERVICE.spreadsheets()
+    result = (
+        sheet.values()
+        .get(
+            spreadsheetId=SAMPLE_SPREADSHEET_ID,
+            range=range_name
+        )
+        .execute()
+    )
+    values = result.get("values", [])
+
+    return values
+
 
 def load_google_sheets():
-  global SERVICE
+  global SERVICE, QUESTIONS
   """Shows basic usage of the Sheets API.
   Prints values from a sample spreadsheet.
   """
@@ -45,39 +61,18 @@ def load_google_sheets():
 
   SERVICE = build("sheets", "v4", credentials=creds)
 
-
-def get_range(range_name: str) -> list[list[str]]:
-    sheet = SERVICE.spreadsheets()
-    result = (
-        sheet.values()
-        .get(
-            spreadsheetId=SAMPLE_SPREADSHEET_ID,
-            range=range_name
-        )
-        .execute()
-    )
-    values = result.get("values", [])
-
-    return values
-
+  QUESTIONS = pd.DataFrame(get_range(f"Responses!B1:F1"), columns=["Q1", "Q2", "Q3", "Q4", "Q5"])
 
 def get_team_numbers() -> list[str]:
     values = get_range(f"Responses!I2:I{MAX_ROW}")
 
-    return [value[0] for value in values]
-
-def get_questions_and_answers() -> list[list[str]]:
-    question_values = get_range("Responses!B1:F1")
-
-    questions = question_values[0]
+    return [int(value[0]) for value in values]
 
-    answers_values = get_range(f"Responses!B2:F{MAX_ROW}")
+def get_questions_and_answers() -> pd.DataFrame:
+    columns = ["Q1", "Q2", "Q3", "Q4", "Q5", "Q6", "Q7", "team_number", "email_address", "name"]
 
-    name_values = get_range(f"Responses!K2:K{MAX_ROW}")
+    answers_values = get_range(f"Responses!B2:K{MAX_ROW}")
 
-    questions_and_answers: list[list[str]] = []
-    for answers, names in zip(answers_values, name_values):
-        for question, answer, name in zip(questions, answers, names):
-            questions_and_answers.append([question, answer, name])
+    df = pd.DataFrame(answers_values, columns=columns)
 
-    return questions_and_answers
+    return df

ice_breaking_challenge/index.py

@@ -21,6 +21,6 @@ def index() -> None:
         case "GET":
             return render_template("index.html")
         case "POST":  # index.html에서 `다음` 버튼 눌렀을 때
-            session["team_number"] = request.form.get("team_number")
-            session["team_size"] = request.form.get("team_size")
+            session["team_number"] = int(request.form.get("team_number"))
+            session["team_size"] = int(request.form.get("team_size"))
             return redirect(url_for("qr.qr"))

ice_breaking_challenge/qr.py

@@ -33,9 +33,13 @@ def qr() -> None:
             if session.get("team_number") not in counter:
                 flash("해당 팀 번호가 존재하지 않습니다.")
                 return render_template("index.html")
-            if counter[session.get("team_number")] == int(session["team_size"]):
+            if counter[session.get("team_number")] >= int(session["team_size"]):
                 qna = get_questions_and_answers()
-                Thread(target=background_task.background_task, args=(session.sid, qna)).start()
+                team_size = session.get("team_size")
+                import time
+                Thread(target=background_task.background_task, args=(session.sid, qna, team_size)).start()
+
+
                 # import time
                 # time.sleep(100)
                 return redirect(url_for("introduction.introduction"))

ice_breaking_challenge/quiz.py

@@ -1,14 +1,27 @@
 from flask import Blueprint, render_template, session
+from flask import request, redirect, url_for
 
 from ice_breaking_challenge import quiz_results
 
 bp = Blueprint("quiz", __name__, url_prefix="/quiz")
 
-@bp.route("/", methods=["GET"])
+@bp.route("/", methods=["GET", "POST"])
 def quiz():
     """quiz"""
     quizzes = quiz_results[session.sid]
-    return render_template("quiz.html", quizzes=quizzes, length=len(quizzes))
+    if 'question_number' not in session:
+        session['question_number'] = 0
+    else:
+        session['question_number'] += 1
+
+    if session['question_number'] == 2: # TODO:
+        return redirect(url_for("quiz.finish"))
+
+    print(session['question_number'])
+    quiz = quizzes[session['question_number']]
+
+    return render_template("quiz.html", quiz=quiz)
+
 
 @bp.route("/finish", methods=["GET"])
 def finish():

ice_breaking_challenge/templates/quiz.html

@@ -3,42 +3,31 @@
 {% block content %}
   <h1>퀴즈 생성 결과</h1>
 
-  {% if quizzes %}
+  {% if quiz %}
     <ul>
-      {% for quiz in quizzes %}
-        <li>
           <h2>문제 주인: {{ quiz[0] }}</h2> <!-- 이름 부분 -->
           <h3>질문: {{ quiz[1] }}</h3> <!-- 질문 부분 -->
           <ul>
-            { quiz[2] } <!-- 4지선다 보기 -->
+            {{ quiz[2] }} <!-- 4지선다 보기 -->
           </ul>
-          <button onclick="showAnswer('{{ loop.index0 }}')">정답 보기</button>
-          <p id="answer-{{ loop.index0 }}" style="display: none;">정답: {{ quiz[3] }}</p> <!-- 정답 -->
-        </li>
-      {% endfor %}
+          <button onclick="showAnswer()">정답 보기</button>
+          <p id="answer" style="display: none;">정답: {{ quiz[3] }}</p> <!-- 정답 -->
     </ul>
   {% else %}
     <p>퀴즈가 없습니다. 다시 시도해 주세요.</p>
   {% endif %}
+    <form method="post" style="margin-top: 20px;">
+      <input type="submit" value="다음" style="padding: 10px 20px; font-size: 16px; cursor: pointer; border-radius: 5px; border: none; background-color: #2980b9; color: white;">
+    </form>
 
   <script>
-    let currentQuizIndex = 0;
-
-    function showAnswer(index) {
-      const answer = document.getElementById(`answer-${index}`);
+    function showAnswer() {
+      const answer = document.getElementById(`answer`);
       if (answer.style.display === "none") {
         answer.style.display = "block";
       } else {
         answer.style.display = "none";
       }
-      currentQuizIndex++;
-
-      // 퀴즈를 모두 풀고 나면 마무리 페이지로 이동
-      if (currentQuizIndex === { length }) {
-        setTimeout(() => {
-          window.location.href = "{{ url_for('quiz.finish') }}";
-        }, 3000); // 3초 후 자동 이동
-      }
     }
   </script>
 {% endblock %}

ice_breaking_challenge/templates/topic.html

@@ -1,18 +1,13 @@
 {% extends 'base.html' %}
 
 {% block content %}
-  <h1 id="topic">{{ topic }}</h1>
+  <h1 id="topic">{{ topic }}</h1>  <!-- 서버에서 전달한 주제를 바로 표시 -->
 
   <script>
-    // 20초마다 페이지를 새로고침하는 함수
-    function updateTopic() {
-      setTimeout(() => {
-        window.location.reload();  // 페이지를 새로고침하여 새로운 주제를 불러옴
-      }, 20000); // 20초
-    }
-
-    // 페이지가 로드될 때 주제 업데이트 함수 호출
-    updateTopic();
+    // 20초마다 페이지 새로고침
+    setInterval(function() {
+      window.location.reload();  // 페이지를 새로고침하여 새로운 주제를 서버에서 가져옴
+    }, 20000);
   </script>
 {% endblock %}
 

ice_breaking_challenge/topic.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, render_template, redirect, url_for
+from flask import Blueprint, render_template, redirect, url_for, jsonify
 from flask import session
 import random
 from ice_breaking_challenge import quiz_generated
@@ -17,4 +17,3 @@ def topic() -> None:
     else:
         selected_topic = random.choice(topics)
         return render_template("topic.html", topic=selected_topic)
-    

requirements.txt

@@ -11,3 +11,4 @@ google-auth
 google-auth-httplib2
 google-auth-oauthlib
 google-common-protos
+pandas