Update app.py

app.py

@@ -56,20 +56,18 @@ def respond_hf_qna(
     except ValueError as e:
         return f"오류: {str(e)}"
 
-    # 시스템 메시지 + 유저 질문을 한 번만 전달
     messages = [
         {"role": "system", "content": system_message},
         {"role": "user", "content": question}
     ]
 
     try:
-        # 스트리밍 대신 전체 답변(비스트리밍) 호출
         response = client.chat_completion(
             messages,
             max_tokens=max_tokens,
             temperature=temperature,
             top_p=top_p,
-            stream=False,  # 스트리밍 비활성화
+            stream=False,
         )
         assistant_message = response.choices[0].message.content
         return assistant_message
@@ -175,20 +173,29 @@ with gr.Blocks() as demo:
             show_copy_button=False
         )
 
-    # --- Tab: 일반 모델 ---
+    #################
+    # 일반 모델 탭
+    #################
     with gr.Tab("일반 모델"):
-        # 모델명 선택은 그대로 상단에 둠
+        # 모델명 선택
         model_name = gr.Radio(
             choices=list(MODELS.keys()),
             label="Language Model (HuggingFace)",
             value="Zephyr 7B Beta"
         )
 
-        # 질문(5칸), 답변(5칸)
-        question_input = gr.Textbox(label="질문을 입력하세요", lines=5)
+        # 입력1~5 (한 줄)
+        with gr.Row():
+            input1 = gr.Textbox(label="입력1", lines=1)
+            input2 = gr.Textbox(label="입력2", lines=1)
+            input3 = gr.Textbox(label="입력3", lines=1)
+            input4 = gr.Textbox(label="입력4", lines=1)
+            input5 = gr.Textbox(label="입력5", lines=1)
+
+        # 답변
         answer_output = gr.Textbox(label="답변", lines=5, interactive=False)
 
-        # 설정(Advanced Settings)을 답변 아래에 둠
+        # 고급 설정을 답변 아래에
         with gr.Accordion("고급 설정 (일반 모델)", open=False):
             max_tokens = gr.Slider(minimum=0, maximum=2000, value=500, step=100, label="Max Tokens")
             temperature = gr.Slider(minimum=0.1, maximum=2.0, value=0.7, step=0.05, label="Temperature")
@@ -204,10 +211,23 @@ with gr.Blocks() as demo:
 
         submit_button = gr.Button("전송")
 
+        # 다섯 입력칸을 합쳐서 question으로 만든 뒤 응답
+        def merge_and_call_hf(i1, i2, i3, i4, i5, m_name, mt, temp, top_p_, sys_msg, hf_token):
+            question = " ".join([i1, i2, i3, i4, i5])
+            return respond_hf_qna(
+                question=question,
+                model_name=m_name,
+                max_tokens=mt,
+                temperature=temp,
+                top_p=top_p_,
+                system_message=sys_msg,
+                hf_token=hf_token
+            )
+
         submit_button.click(
-            fn=respond_hf_qna,
+            fn=merge_and_call_hf,
             inputs=[
-                question_input,
+                input1, input2, input3, input4, input5,  # 입력1~5
                 model_name,
                 max_tokens,
                 temperature,
@@ -218,10 +238,19 @@ with gr.Blocks() as demo:
             outputs=answer_output
         )
 
-    # --- Tab: Cohere Command R+ ---
+    #################
+    # Cohere Command R+ 탭
+    #################
     with gr.Tab("Cohere Command R+"):
-        # 질문(5칸), 답변(5칸)
-        cohere_question_input = gr.Textbox(label="질문을 입력하세요", lines=5)
+        # 입력1~5 (한 줄)
+        with gr.Row():
+            cohere_input1 = gr.Textbox(label="입력1", lines=1)
+            cohere_input2 = gr.Textbox(label="입력2", lines=1)
+            cohere_input3 = gr.Textbox(label="입력3", lines=1)
+            cohere_input4 = gr.Textbox(label="입력4", lines=1)
+            cohere_input5 = gr.Textbox(label="입력5", lines=1)
+
+        # 답변
         cohere_answer_output = gr.Textbox(label="답변", lines=5, interactive=False)
 
         with gr.Accordion("고급 설정 (Cohere)", open=False):
@@ -239,10 +268,21 @@ with gr.Blocks() as demo:
 
         cohere_submit_button = gr.Button("전송")
 
+        def merge_and_call_cohere(i1, i2, i3, i4, i5, sys_msg, mt, temp, top_p_, hf_token):
+            question = " ".join([i1, i2, i3, i4, i5])
+            return respond_cohere_qna(
+                question=question,
+                system_message=sys_msg,
+                max_tokens=mt,
+                temperature=temp,
+                top_p=top_p_,
+                hf_token=hf_token
+            )
+
         cohere_submit_button.click(
-            fn=respond_cohere_qna,
+            fn=merge_and_call_cohere,
             inputs=[
-                cohere_question_input,
+                cohere_input1, cohere_input2, cohere_input3, cohere_input4, cohere_input5,
                 cohere_system_message,
                 cohere_max_tokens,
                 cohere_temperature,
@@ -252,10 +292,19 @@ with gr.Blocks() as demo:
             outputs=cohere_answer_output
         )
 
-    # --- Tab: ChatGPT ---
+    #################
+    # ChatGPT 탭
+    #################
     with gr.Tab("gpt-4o-mini"):
-        # 질문(5칸), 답변(5칸)
-        chatgpt_question_input = gr.Textbox(label="질문을 입력하세요", lines=5)
+        # 입력1~5 (한 줄)
+        with gr.Row():
+            chatgpt_input1 = gr.Textbox(label="입력1", lines=1)
+            chatgpt_input2 = gr.Textbox(label="입력2", lines=1)
+            chatgpt_input3 = gr.Textbox(label="입력3", lines=1)
+            chatgpt_input4 = gr.Textbox(label="입력4", lines=1)
+            chatgpt_input5 = gr.Textbox(label="입력5", lines=1)
+
+        # 답변
         chatgpt_answer_output = gr.Textbox(label="답변", lines=5, interactive=False)
 
         with gr.Accordion("고급 설정 (ChatGPT)", open=False):
@@ -273,10 +322,21 @@ with gr.Blocks() as demo:
 
         chatgpt_submit_button = gr.Button("전송")
 
+        def merge_and_call_chatgpt(i1, i2, i3, i4, i5, sys_msg, mt, temp, top_p_, openai_token):
+            question = " ".join([i1, i2, i3, i4, i5])
+            return respond_chatgpt_qna(
+                question=question,
+                system_message=sys_msg,
+                max_tokens=mt,
+                temperature=temp,
+                top_p=top_p_,
+                openai_token=openai_token
+            )
+
         chatgpt_submit_button.click(
-            fn=respond_chatgpt_qna,
+            fn=merge_and_call_chatgpt,
             inputs=[
-                chatgpt_question_input,
+                chatgpt_input1, chatgpt_input2, chatgpt_input3, chatgpt_input4, chatgpt_input5,
                 chatgpt_system_message,
                 chatgpt_max_tokens,
                 chatgpt_temperature,
@@ -334,21 +394,22 @@ with gr.Blocks() as demo:
         except Exception as e:
             return f"예상치 못한 오류가 발생했습니다: {str(e)}"
 
-    # --- Tab: Claude ---
+    #################
+    # Claude 탭
+    #################
     with gr.Tab("claude-3-haiku"):
         gr.Markdown("claude-3-haiku모델")
 
-        # 질문(5칸), 답변(5칸)
-        claude_question_input = gr.Textbox(
-            label="질문을 입력하세요",
-            lines=5,
-            placeholder="질문을 입력하세요..."
-        )
-        claude_answer_output = gr.Textbox(
-            label="답변",
-            interactive=False,
-            lines=5
-        )
+        # 입력1~5 (한 줄)
+        with gr.Row():
+            claude_input1 = gr.Textbox(label="입력1", lines=1)
+            claude_input2 = gr.Textbox(label="입력2", lines=1)
+            claude_input3 = gr.Textbox(label="입력3", lines=1)
+            claude_input4 = gr.Textbox(label="입력4", lines=1)
+            claude_input5 = gr.Textbox(label="입력5", lines=1)
+
+        # 답변
+        claude_answer_output = gr.Textbox(label="답변", interactive=False, lines=5)
 
         with gr.Accordion("고급 설정 (Claude)", open=False):
             claude_system_message = gr.Textbox(
@@ -382,10 +443,21 @@ with gr.Blocks() as demo:
 
         claude_submit_button = gr.Button("전송")
 
+        def merge_and_call_claude(i1, i2, i3, i4, i5, sys_msg, mt, temp, top_p_, claude_key):
+            question = " ".join([i1, i2, i3, i4, i5])
+            return respond_claude_qna(
+                question=question,
+                system_message=sys_msg,
+                max_tokens=mt,
+                temperature=temp,
+                top_p=top_p_,
+                claude_api_key=claude_key
+            )
+
         claude_submit_button.click(
-            fn=respond_claude_qna,
+            fn=merge_and_call_claude,
             inputs=[
-                claude_question_input,
+                claude_input1, claude_input2, claude_input3, claude_input4, claude_input5,
                 claude_system_message,
                 claude_max_tokens,
                 claude_temperature,