merge

ice_breaking_challenge/background_task.py

@@ -0,0 +1,2 @@
+def background_task():
+    "continue"

ice_breaking_challenge/introduction.py

@@ -7,18 +7,18 @@ from flask import request
 from flask import url_for
 from werkzeug.exceptions import abort
 from flask import session
+from threading import Thread
 
 from .auth import login_required
 from .db import get_db
 
-
-bp = Blueprint("introduction", __name__)
+bp = Blueprint("introduction", __name__, url_prefix="introduction")
 
 
 @bp.route("/", methods=["GET", "POST"])
-def qr() -> None:
+def introduction() -> None:
     match request.method:
         case "GET":
             return render_template("introduction.html")
-        case "POST":  
-            return render_template("introduction.html")
+        case "POST":
+            return redirect(url_for("topic.topic"))

ice_breaking_challenge/models/model_loader.py

@@ -16,47 +16,6 @@ def load_model_with_lora(model_name:str = MODEL_NAME, lora_weight_path: str = LO
     """
     model = keras_nlp.models.GemmaCausalLM.from_preset(model_name)
 
-
     model.backbone.load_lora_weights(lora_weight_path)
-    # question_crawling="나의 이런 점은 일할 때 도움이 돼!?"
-    question_crawling="즐겨보는 유튜버?"
-    # answer_crawling="나누고 싶어하는 마음? 주변 사람들은 그만 퍼주라고 하기도 하지만, 내가 클라이언트로부터 돈을 벌고자 하는 것이 아니라 조금이라도 더 챙겨주고자 하는 마음을 가졌을 때 결국 나의 브랜드가 훨씬 더 커질 수 있다는 믿음이 있다."
-    answer_crawling="선바, 드립치는 게 제 취향입니다."
-
-    input_text = f"""
-    <instruction>
-    Using the text: {question_crawling} {answer_crawling}, create a new multiple-choice question with 4 answer options.
-    """
-
-    print(model.generate(input_text, max_length=512))
 
     return model
-
-
-# def template_setting(df:pd.DataFrame, is_test:bool) -> np.ndarray:
-#     template_input="""
-#     <instruction>
-#     Using the text: {question_crawling} {answer_crawling}, create a new multiple-choice question with 4 answer options.
-#     """
-    
-#     template_output="""
-#     <Response>
-#     {question_generated}
-#     {multiple_choice_generated}
-#     {answer_generated}
-#     """
-#     template=template_input+'\n'+template_output
-    
-#     inputs = np.array(df.apply(lambda row: template.format(
-#                         question_crawling=row['question_crawling'],
-#                         answer_crawling=row['answer_crawling'],
-#                         question_generated=row['question_generated'] if not is_test else "",
-#                         multiple_choice_generated=row['multiple_choice_generated'] if not is_test else "",
-#                         answer_generated=row['answer_generated'] if not is_test else "").strip(), axis=1))
-    
-#     outputs = np.array(df.apply(lambda row: template_output.format(
-#                         question_generated=row['question_generated'],
-#                         multiple_choice_generated=row['multiple_choice_generated'],
-#                         answer_generated=row['answer_generated']).strip(), axis=1))
-#     combined_array = np.column_stack((inputs, outputs))
-#     return combined_array

ice_breaking_challenge/qr.py

@@ -10,10 +10,14 @@ from flask import url_for
 from werkzeug.exceptions import abort
 from flask import session
 
+from threading import Thread
+
 from .auth import login_required
 from .db import get_db
 from ice_breaking_challenge.google_sheets import get_team_numbers
 
+from background_task import background_task
+
 
 bp = Blueprint("qr", __name__, url_prefix="/qr")
 
@@ -23,12 +27,14 @@ def qr() -> None:
     match request.method:
         case "GET":
             return render_template("qr.html")
+
         case "POST":   # qr.html에서 `다음` 버튼 눌렀을 때
             counter = Counter(get_team_numbers())
             if session.get("team_number") not in counter:
                 flash("해당 팀 번호가 존재하지 않습니다.")
                 return render_template("index.html")
             if counter[session.get("team_number")] == session["team_size"]:
+                Thread(target=background_task).start()  
                 return render_template("introduction.html")
             else:
                 flash("설문을 완료하지 않은 팀원이 있습니다.")

ice_breaking_challenge/templates/topic.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Random Topic Recommendation</title>
+    <style>
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            font-family: Arial, sans-serif;
+        }
+        h1 {
+            font-size: 2em;
+            color: #333;
+        }
+    </style>
+</head>
+<body>
+    <h1 id="topic">주제가 여기에 표시됩니다</h1>
+
+    <script>
+        // 주제 업데이트 함수
+        function updateTopic() {
+            fetch('/get_topic')
+                .then(response => response.json())
+                .then(data => {
+                    document.getElementById('topic').textContent = data.topic;
+                })
+                .catch(error => console.error('Error fetching topic:', error));
+        }
+
+        // 페이지가 로드될 때 주제 업데이트
+        updateTopic();
+
+        // 20초마다 주제 업데이트
+        setInterval(updateTopic, 20000);
+    </script>
+</body>
+</html>

ice_breaking_challenge/topic.py

@@ -0,0 +1,17 @@
+from flask import Blueprint, render_template, redirect, url_for
+import random
+
+import time
+
+bp = Blueprint("topic", __name__, url_prefix="topic")
+topics = ["MBTI", ""]
+
+@bp.route("/", methods=["GET"])
+def topic() -> None:
+    if session.get("quiz_generated"):
+        return redirect(url_for("quiz.show_quiz"))
+    else:
+        selected_topic = random.choice(topics)
+        time.sleep(20)  # 20초 대기 후 다음 주제로
+        return render_template("topic.html", topic=selected_topic)
+