Update app.py

app.py

@@ -21,20 +21,25 @@ def upload_and_process_file():
     return None
 
 # 생활기록부 문구 생성 함수
-def generate_living_record(data, selected_instruction):
+def generate_living_record(data, selected_instruction, subjects=None, major=None):
     data_str = str(data)
-    instruction_content = (instructions.instruction if selected_instruction == "초등학교" 
-                         else instructions.highschool_instruction)
     
+    if selected_instruction == "중·고등학교" and subjects and major:
+        # 선택된 교과목들을 문자열로 변환
+        subjects_str = ", ".join(subjects)
+        # instruction 문자열 포매팅
+        instruction_text = instructions.highschool_instruction.format(
+            subjects=subjects_str,
+            major=major
+        )
+    else:
+        instruction_text = instructions.instruction
+        
     response = openai.ChatCompletion.create(
         model="gpt-4o-mini",
         messages=[
-            {"role": "system", 
-             "content": instruction_content
-            },
-            {"role": "user", 
-             "content": data_str
-            }
+            {"role": "system", "content": instruction_text},
+            {"role": "user", "content": data_str}
         ],
         temperature=0.7,
         max_tokens=10000,