Update app.py

app.py

@@ -4,7 +4,6 @@ import openai
 import anthropic
 import os
 
-# 제거할 모델들을 MODELS 사전에서 제외
 MODELS = {
     "Zephyr 7B Beta": "HuggingFaceH4/zephyr-7b-beta",
     "Meta Llama 3.1 8B": "meta-llama/Meta-Llama-3.1-8B-Instruct",
@@ -15,7 +14,6 @@ MODELS = {
     "Aya-23-35B": "CohereForAI/aya-23-35B"
 }
 
-# Cohere Command R+ 모델 ID 정의
 COHERE_MODEL = "CohereForAI/c4ai-command-r-plus-08-2024"
 
 def get_client(model_name):
@@ -30,6 +28,7 @@ def get_client(model_name):
         raise ValueError("유효하지 않은 모델 이름입니다.")
     return InferenceClient(model_id, token=hf_token)
 
+
 def respond(
     message,
     chat_history,
@@ -39,12 +38,16 @@ def respond(
     top_p,
     system_message,
 ):
+    """
+    기존 모델(Zephyr, Meta Llama 등) / Cohere Command R+ 모델에 대응하는 함수
+    """
     try:
         client = get_client(model_name)
     except ValueError as e:
         chat_history.append((message, str(e)))
         return chat_history
 
+    # Gradio에서 유지하던 형식
     messages = [{"role": "system", "content": system_message}]
     for human, assistant in chat_history:
         messages.append({"role": "user", "content": human})
@@ -52,8 +55,8 @@ def respond(
     messages.append({"role": "user", "content": message})
 
     try:
+        # Cohere 모델(비스트리밍) vs 기타 모델(스트리밍) 구분
         if model_name == "Cohere Command R+":
-            # Cohere Command R+ 모델을 위한 비스트리밍 처리
             response = client.chat_completion(
                 messages,
                 max_tokens=max_tokens,
@@ -64,7 +67,6 @@ def respond(
             chat_history.append((message, assistant_message))
             return chat_history
         else:
-            # 다른 모델들을 위한 스트리밍 처리
             stream = client.chat_completion(
                 messages,
                 max_tokens=max_tokens,
@@ -86,6 +88,7 @@ def respond(
         chat_history.append((message, error_message))
         yield chat_history
 
+
 def cohere_respond(
     message,
     chat_history,
@@ -94,6 +97,9 @@ def cohere_respond(
     temperature,
     top_p,
 ):
+    """
+    Cohere Command R+ 전용 응답 함수
+    """
     model_name = "Cohere Command R+"
     try:
         client = get_client(model_name)
@@ -101,7 +107,11 @@ def cohere_respond(
         chat_history.append((message, str(e)))
         return chat_history
 
-    messages = [{"role": "system", "content": system_message}]
+    messages = []
+    # system_message는 messages 내 system 키로 추가하지 않고, 아래와 같이 적용해도 문제는 없음
+    # 이 부분은 기존 구조를 유지
+    messages.append({"role": "system", "content": system_message})
+
     for human, assistant in chat_history:
         if human:
             messages.append({"role": "user", "content": human})
@@ -111,7 +121,6 @@ def cohere_respond(
     messages.append({"role": "user", "content": message})
 
     try:
-        # Cohere Command R+ 모델을 위한 비스트리밍 처리
         response_full = client.chat_completion(
             messages,
             max_tokens=max_tokens,
@@ -126,6 +135,7 @@ def cohere_respond(
         chat_history.append((message, error_message))
         return chat_history
 
+
 def chatgpt_respond(
     message,
     chat_history,
@@ -134,11 +144,15 @@ def chatgpt_respond(
     temperature,
     top_p,
 ):
+    """
+    ChatGPT (OpenAI) 전용 응답 함수
+    """
     openai.api_key = os.getenv("OPENAI_API_KEY")
     if not openai.api_key:
         chat_history.append((message, "OPENAI_API_KEY 환경 변수가 필요합니다."))
         return chat_history
 
+    # ChatGPT는 system role을 messages 내에서 허용하므로 현재 방식 OK
     messages = [{"role": "system", "content": system_message}]
     for human, assistant in chat_history:
         messages.append({"role": "user", "content": human})
@@ -147,7 +161,7 @@ def chatgpt_respond(
 
     try:
         response = openai.ChatCompletion.create(
-            model="gpt-4",  # 올바른 모델 ID로 수정 (예: "gpt-4")
+            model="gpt-4",  # 적절한 모델 ID를 사용
             messages=messages,
             max_tokens=max_tokens,
             temperature=temperature,
@@ -161,6 +175,7 @@ def chatgpt_respond(
         chat_history.append((message, error_message))
         return chat_history
 
+
 def claude_respond(
     message,
     chat_history,
@@ -169,33 +184,39 @@ def claude_respond(
     temperature,
     top_p,
 ):
+    """
+    Anthropic Claude 전용 응답 함수 (Messages API)
+    - "system" role은 messages 목록에 넣지 않고,
+      최상위 system 인자로 넘겨야 한다.
+    """
     anthropic_api_key = os.getenv("ANTHROPIC_API_KEY")
     if not anthropic_api_key:
         chat_history.append((message, "ANTHROPIC_API_KEY 환경 변수가 필요합니다."))
         return chat_history
 
-    client = anthropic.Anthropic(
-        api_key=anthropic_api_key,
-    )
+    client = anthropic.Anthropic(api_key=anthropic_api_key)
 
-    # 대화 기록을 하나의 메시지 리스트로 변환
-    messages = [{"role": "system", "content": system_message}]
+    # Anthropic Messages API에 맞게 "system" role은 top-level 파라미터로,
+    # 나머지는 user/assistant만 messages에 넣음
+    # (messages 내 "system" role이 있으면 오류 발생)
+    anthro_messages = []
     for human, assistant in chat_history:
         if human:
-            messages.append({"role": "user", "content": human})
+            anthro_messages.append({"role": "user", "content": human})
         if assistant:
-            messages.append({"role": "assistant", "content": assistant})
-    messages.append({"role": "user", "content": message})
+            anthro_messages.append({"role": "assistant", "content": assistant})
+    anthro_messages.append({"role": "user", "content": message})
 
     try:
         response = client.messages.create(
-            model="claude-3-haiku-20240307",  # 사용 가능한 Claude 모델로 수정
-            max_tokens=max_tokens,
+            model="claude-3-haiku-20240307",  # Claude 모델 예시 (사용 가능 모델 확인)
+            system=system_message,         # ← 여기서 system_message를 전달
+            messages=anthro_messages,      # user/assistant만 포함
+            max_tokens_to_sample=max_tokens,
             temperature=temperature,
             top_p=top_p,
-            messages=messages,
         )
-        assistant_message = response['completion']
+        assistant_message = response["completion"]
         chat_history.append((message, assistant_message))
         return chat_history
     except Exception as e:
@@ -203,13 +224,15 @@ def claude_respond(
         chat_history.append((message, error_message))
         return chat_history
 
+
 def clear_conversation():
     return []
 
+
 with gr.Blocks() as demo:
     gr.Markdown("# Prompting AI Chatbot")
     gr.Markdown("언어모델별 프롬프트 테스트 챗봇입니다.")
-    
+
     with gr.Tab("일반 모델"):
         with gr.Row():
             with gr.Column(scale=1):
@@ -240,7 +263,7 @@ with gr.Blocks() as demo:
         msg.submit(respond, [msg, chatbot, model_name, max_tokens, temperature, top_p, system_message], chatbot)
         submit_button.click(respond, [msg, chatbot, model_name, max_tokens, temperature, top_p, system_message], chatbot)
         clear_button.click(clear_conversation, outputs=chatbot, queue=False)
-    
+
     with gr.Tab("Cohere Command R+"):
         with gr.Row():
             cohere_system_message = gr.Textbox(
@@ -260,7 +283,7 @@ with gr.Blocks() as demo:
                 step=0.05,
                 label="Top-P",
             )
-        
+
         cohere_chatbot = gr.Chatbot(height=600)
         cohere_msg = gr.Textbox(label="메세지를 입력하세요")
         with gr.Row():
@@ -278,7 +301,7 @@ with gr.Blocks() as demo:
             cohere_chatbot
         )
         cohere_clear_button.click(clear_conversation, outputs=cohere_chatbot, queue=False)
-    
+
     with gr.Tab("ChatGPT"):
         with gr.Row():
             chatgpt_system_message = gr.Textbox(
@@ -298,7 +321,7 @@ with gr.Blocks() as demo:
                 step=0.05,
                 label="Top-P",
             )
-        
+
         chatgpt_chatbot = gr.Chatbot(height=600)
         chatgpt_msg = gr.Textbox(label="메세지를 입력하세요")
         with gr.Row():
@@ -316,7 +339,7 @@ with gr.Blocks() as demo:
             chatgpt_chatbot
         )
         chatgpt_clear_button.click(clear_conversation, outputs=chatgpt_chatbot, queue=False)
-    
+
     with gr.Tab("Claude"):
         with gr.Row():
             claude_system_message = gr.Textbox(
@@ -336,13 +359,14 @@ with gr.Blocks() as demo:
                 step=0.05,
                 label="Top-P",
             )
-        
+
         claude_chatbot = gr.Chatbot(height=600)
         claude_msg = gr.Textbox(label="메세지를 입력하세요")
         with gr.Row():
             claude_submit_button = gr.Button("전송")
             claude_clear_button = gr.Button("대화 내역 지우기")
-        
+
+        # Claude 전용 함수 호출
         claude_msg.submit(
             claude_respond,
             [claude_msg, claude_chatbot, claude_system_message, claude_max_tokens, claude_temperature, claude_top_p],