Update app.py

app.py

@@ -22,19 +22,16 @@ def upload_and_process_file():
 
 # 생활기록부 문구 생성 함수
 def generate_living_record(data, selected_instruction, subjects=None, major=None):
-    data_str = str(data)
-    
-    if selected_instruction == "중·고등학교" and subjects and major:
-        # 선택된 교과목들을 문자열로 변환
-        subjects_str = ", ".join(subjects)
-        # instruction 문자열 포매팅
-        instruction_text = instructions.highschool_instruction.format(
-            subjects=subjects_str,
-            major=major
-        )
+    if selected_instruction == "중·고등학교":
+        # 교과목과 희망전공 정보를 데이터 시작 부분에 추가
+        data_str = f"교과목: {', '.join(subjects) if subjects else ''}\n"
+        data_str += f"희망전공: {major if major else ''}\n\n"
+        data_str += str(data)
     else:
-        instruction_text = instructions.instruction
-        
+        data_str = str(data)
+    
+    instruction_text = instructions.highschool_instruction if selected_instruction == "중·고등학교" else instructions.instruction
+    
     response = openai.ChatCompletion.create(
         model="gpt-4o-mini",
         messages=[