biftekpatates commited on
Commit
39cb513
ยท
verified ยท
1 Parent(s): 29cc31c

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +19 -32
app.py CHANGED
@@ -5,7 +5,7 @@ from openai import OpenAI
5
  from prompts.initial_prompt import INITIAL_PROMPT
6
  from prompts.main_prompt import MAIN_PROMPT
7
 
8
- # .env ํŒŒ์ผ์—์„œ OPENAI_API_KEY ๋กœ๋“œ
9
  if os.path.exists(".env"):
10
  load_dotenv(".env")
11
 
@@ -13,33 +13,30 @@ OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
13
 
14
  client = OpenAI(api_key=OPENAI_API_KEY)
15
 
16
-
17
-
18
  def gpt_call(history, user_message,
19
  model="gpt-4o-mini",
20
  max_tokens=512,
21
  temperature=0.7,
22
  top_p=0.95):
23
  """
24
- OpenAI ChatCompletion API๋ฅผ ํ†ตํ•ด ๋‹ต๋ณ€์„ ์ƒ์„ฑํ•˜๋Š” ํ•จ์ˆ˜.
25
  - history: [(user_text, assistant_text), ...]
26
- - user_message: ์‚ฌ์šฉ์ž๊ฐ€ ๋ฐฉ๊ธˆ ์ž…๋ ฅํ•œ ๋ฉ”์‹œ์ง€
27
  """
28
- # 1) ์‹œ์Šคํ…œ ๋ฉ”์‹œ์ง€(=MAIN_PROMPT)๋ฅผ ๊ฐ€์žฅ ์•ž์— ์ถ”๊ฐ€
29
  messages = [{"role": "system", "content": MAIN_PROMPT}]
30
 
31
- # 2) ๊ธฐ์กด ๋Œ€ํ™” ๊ธฐ๋ก(history)์„ OpenAI ํ˜•์‹์œผ๋กœ ๋ณ€ํ™˜
32
- # user_text -> 'user' / assistant_text -> 'assistant'
33
  for user_text, assistant_text in history:
34
  if user_text:
35
  messages.append({"role": "user", "content": user_text})
36
  if assistant_text:
37
  messages.append({"role": "assistant", "content": assistant_text})
38
 
39
- # 3) ๋งˆ์ง€๋ง‰์— ์ด๋ฒˆ ์‚ฌ์šฉ์ž์˜ ์ž…๋ ฅ์„ ์ถ”๊ฐ€
40
  messages.append({"role": "user", "content": user_message})
41
 
42
- # 4) OpenAI API ํ˜ธ์ถœ
43
  completion = client.chat.completions.create(
44
  model=model,
45
  messages=messages,
@@ -51,21 +48,18 @@ def gpt_call(history, user_message,
51
 
52
  def respond(user_message, history):
53
  """
54
- Gradio ์ƒ์—์„œ submitํ•  ๋•Œ ํ˜ธ์ถœ๋˜๋Š” ํ•จ์ˆ˜
55
- - user_message: ์‚ฌ์šฉ์ž๊ฐ€ ๋ฐฉ๊ธˆ ์นœ ๋ฉ”์‹œ์ง€
56
- - history: ๊ธฐ์กด (user, assistant) ํŠœํ”Œ ๋ฆฌ์ŠคํŠธ
57
  """
58
- # ์‚ฌ์šฉ์ž๊ฐ€ ๋นˆ ๋ฌธ์ž์—ด์„ ๋ณด๋ƒˆ๋‹ค๋ฉด ์•„๋ฌด ์ผ๋„ ํ•˜์ง€ ์•Š์Œ
59
  if not user_message:
60
  return "", history
61
 
62
- # GPT ๋ชจ๋ธ๋กœ๋ถ€ํ„ฐ ์‘๋‹ต์„ ๋ฐ›์Œ
63
  assistant_reply = gpt_call(history, user_message)
64
 
65
- # history์— (user, assistant) ์Œ ์ถ”๊ฐ€
66
  history.append((user_message, assistant_reply))
67
 
68
- # Gradio์—์„œ๋Š” (์ƒˆ๋กœ ๋น„์›Œ์งˆ ์ž…๋ ฅ์ฐฝ, ๊ฐฑ์‹ ๋œ history)๋ฅผ ๋ฐ˜ํ™˜
69
  return "", history
70
 
71
  ##############################
@@ -74,38 +68,31 @@ def respond(user_message, history):
74
  with gr.Blocks() as demo:
75
  gr.Markdown("## Simple Chat Interface")
76
 
77
- # Chatbot ์ดˆ๊ธฐ ์ƒํƒœ๋ฅผ ์„ค์ •
78
- # ์ฒซ ๋ฒˆ์งธ ๋ฉ”์‹œ์ง€๋Š” (user="", assistant=INITIAL_PROMPT) ํ˜•ํƒœ๋กœ ๋„ฃ์–ด
79
- # ํ™”๋ฉด์ƒ์—์„œ 'assistant'๊ฐ€ INITIAL_PROMPT๋ฅผ ๋งํ•œ ๊ฒƒ์ฒ˜๋Ÿผ ๋ณด์ด๊ฒŒ ํ•จ
80
  chatbot = gr.Chatbot(
81
- value=[{"role": "assistant", "content": INITIAL_PROMPT}],
82
- height=500,
83
- type="messages"
84
  )
85
 
86
-
87
- # (user, assistant) ์Œ์„ ์ €์žฅํ•  ํžˆ์Šคํ† ๋ฆฌ ์ƒํƒœ
88
- # ์—ฌ๊ธฐ์„œ๋„ ๋™์ผํ•œ ์ดˆ๊ธฐ ์ƒํƒœ๋ฅผ ๋„ฃ์–ด์คŒ
89
  state_history = gr.State([("", INITIAL_PROMPT)])
90
 
91
- # ์‚ฌ์šฉ์ž ์ž…๋ ฅ
92
  user_input = gr.Textbox(
93
  placeholder="Type your message here...",
94
  label="Your Input"
95
  )
96
 
97
- # ์ž…๋ ฅ์ด submit๋˜๋ฉด respond() ํ˜ธ์ถœ โ†’ ์ถœ๋ ฅ์€ (์ƒˆ ์ž…๋ ฅ์ฐฝ, ๊ฐฑ์‹ ๋œ chatbot)
98
  user_input.submit(
99
  respond,
100
  inputs=[user_input, state_history],
101
  outputs=[user_input, chatbot]
102
  ).then(
103
- # respond ๋๋‚œ ๋’ค, ์ตœ์‹  history๋ฅผ state_history์— ๋ฐ˜์˜
104
- fn=lambda _, h: h,
105
- inputs=[user_input, chatbot],
106
  outputs=[state_history]
107
  )
108
 
109
- # ๋ฉ”์ธ ์‹คํ–‰
110
  if __name__ == "__main__":
111
  demo.launch(server_name="0.0.0.0", server_port=7860, share=True)
 
 
5
  from prompts.initial_prompt import INITIAL_PROMPT
6
  from prompts.main_prompt import MAIN_PROMPT
7
 
8
+ # Load API key from .env
9
  if os.path.exists(".env"):
10
  load_dotenv(".env")
11
 
 
13
 
14
  client = OpenAI(api_key=OPENAI_API_KEY)
15
 
 
 
16
  def gpt_call(history, user_message,
17
  model="gpt-4o-mini",
18
  max_tokens=512,
19
  temperature=0.7,
20
  top_p=0.95):
21
  """
22
+ Generate responses using OpenAI ChatCompletion API.
23
  - history: [(user_text, assistant_text), ...]
24
+ - user_message: The latest user input.
25
  """
26
+ # 1) Add system message
27
  messages = [{"role": "system", "content": MAIN_PROMPT}]
28
 
29
+ # 2) Convert history into OpenAI message format
 
30
  for user_text, assistant_text in history:
31
  if user_text:
32
  messages.append({"role": "user", "content": user_text})
33
  if assistant_text:
34
  messages.append({"role": "assistant", "content": assistant_text})
35
 
36
+ # 3) Add the latest user input
37
  messages.append({"role": "user", "content": user_message})
38
 
39
+ # 4) OpenAI API call
40
  completion = client.chat.completions.create(
41
  model=model,
42
  messages=messages,
 
48
 
49
  def respond(user_message, history):
50
  """
51
+ Handles user input and generates chatbot responses.
52
+ - user_message: The latest user message.
53
+ - history: A list of (user, assistant) message tuples.
54
  """
 
55
  if not user_message:
56
  return "", history
57
 
 
58
  assistant_reply = gpt_call(history, user_message)
59
 
60
+ # Append new message pair to history
61
  history.append((user_message, assistant_reply))
62
 
 
63
  return "", history
64
 
65
  ##############################
 
68
  with gr.Blocks() as demo:
69
  gr.Markdown("## Simple Chat Interface")
70
 
71
+ # Initialize Chatbot correctly (list of tuples, not dictionaries)
 
 
72
  chatbot = gr.Chatbot(
73
+ value=[("", INITIAL_PROMPT)], # Fixed format
74
+ height=500
 
75
  )
76
 
77
+ # Maintain chat history in state
 
 
78
  state_history = gr.State([("", INITIAL_PROMPT)])
79
 
 
80
  user_input = gr.Textbox(
81
  placeholder="Type your message here...",
82
  label="Your Input"
83
  )
84
 
85
+ # Handle user input
86
  user_input.submit(
87
  respond,
88
  inputs=[user_input, state_history],
89
  outputs=[user_input, chatbot]
90
  ).then(
91
+ fn=lambda h: h, # Fix: Only update history, not chatbot
92
+ inputs=[state_history],
 
93
  outputs=[state_history]
94
  )
95
 
 
96
  if __name__ == "__main__":
97
  demo.launch(server_name="0.0.0.0", server_port=7860, share=True)
98
+