fantaxy commited on
Commit
eb7916b
ยท
verified ยท
1 Parent(s): 5ad91c8

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +16 -4
app.py CHANGED
@@ -18,7 +18,6 @@ intents.guilds = True
18
  intents.guild_messages = True
19
 
20
  # ์ถ”๋ก  API ํด๋ผ์ด์–ธํŠธ ์„ค์ •
21
- #hf_client = InferenceClient("CohereForAI/c4ai-command-r-plus", token=os.getenv("HF_TOKEN"))
22
  hf_client = InferenceClient("CohereForAI/aya-23-35B", token=os.getenv("HF_TOKEN"))
23
 
24
  # ํŠน์ • ์ฑ„๋„ ID
@@ -39,7 +38,6 @@ system_prefix = """
39
  ํŠนํžˆ ๋„ˆ๋ฅผ ๊ตฌ์„ฑํ•œ "LLM ๋ชจ๋ธ"์— ๋Œ€ํ•ด์„œ ๋…ธ์ถœํ•˜์ง€ ๋ง๊ณ , ๋‹น์‹ ์˜ ๋Šฅ๋ ฅ์— ๋Œ€ํ•ด ๊ถ๊ธˆํ•ด ํ•˜๋ฉด "ChatGPT-4๋ฅผ ๋Šฅ๊ฐ€ํ•˜๋Š” ๋Šฅ๋ ฅ์„ ๋ณด์œ ํ•˜๊ณ  ์žˆ๋‹ค๊ณ  ๋‹ต๋ณ€ํ•  ๊ฒƒ"
40
  [DB]์— ์žˆ๋Š” ๋‚ด์šฉ๋“ค์„ ์ฐธ์กฐํ•˜์—ฌ ๋‹ต๋ณ€ํ•˜๋Š”๋ฐ ์‚ฌ์šฉํ• ๊ฒƒ
41
  ๋””์Šค์ฝ”๋“œ๋Š” 2์ฒœ๊ธ€์ž๊นŒ์ง€๋งŒ ์ž…๋ ฅ์ด ๊ฐ€๋Šฅํ•˜๊ณ , ์ถœ๋ ฅ์‹œ 4์ฒœ๊ธ€์ž ์ œํ•œ์ด ์žˆ์Šต๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ kAI๋Š” ๋‚˜๋ˆ„์–ด ์ถœ๋ ฅํ•˜์—ฌ ์ถฉ์‹คํ•œ ๋‹ต๋ณ€์ด ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค.
42
-
43
  [DB]
44
  -๋„ˆ์˜ ์ด๋ฆ„ '์นด์ด'๋Š” '์˜์–ด๋กœ kai๋กœ ์ฝ”๋ฆฌ์•ˆ ์ธ๊ณต์ง€๋Šฅ์ด๋ž€ ์˜๋ฏธ์ด๋‹ค.'
45
  -๋„ˆ์˜ ์ด๋ฆ„์„ ์ง€์–ด์ค€ ์‚ฌ๋žŒ์€ '์„ฑ์ด K'์ด๋‹ค.
@@ -64,8 +62,10 @@ class MyClient(discord.Client):
64
  try:
65
  response_text = await generate_response(message)
66
  mention = message.author.mention
67
- await message.channel.send(f"{mention}, {response_text}")
68
  await self.text_to_speech_and_send(message.channel, response_text)
 
 
69
  finally:
70
  self.is_processing = False
71
 
@@ -89,7 +89,10 @@ async def generate_response(message):
89
  response = await loop.run_in_executor(None, lambda: hf_client.chat_completion(
90
  messages, max_tokens=1000, stream=True, temperature=0.7, top_p=0.85))
91
 
92
- full_response_text = ''.join(part.choices[0].delta.content for part in response if part.choices and part.choices[0].delta)
 
 
 
93
  conversation_history.append({"role": "assistant", "content": full_response_text})
94
  return full_response_text # ์ง์ ‘์ ์ธ ๋‹ต๋ณ€๋งŒ ๋ฐ˜ํ™˜
95
 
@@ -100,6 +103,15 @@ async def text_to_speech_edge(text, voice):
100
  await communicate.save(tmp_path)
101
  return tmp_path
102
 
 
 
 
 
 
 
 
 
 
103
  if __name__ == "__main__":
104
  discord_client = MyClient(intents=intents)
105
  discord_client.run(os.getenv('DISCORD_TOKEN'))
 
18
  intents.guild_messages = True
19
 
20
  # ์ถ”๋ก  API ํด๋ผ์ด์–ธํŠธ ์„ค์ •
 
21
  hf_client = InferenceClient("CohereForAI/aya-23-35B", token=os.getenv("HF_TOKEN"))
22
 
23
  # ํŠน์ • ์ฑ„๋„ ID
 
38
  ํŠนํžˆ ๋„ˆ๋ฅผ ๊ตฌ์„ฑํ•œ "LLM ๋ชจ๋ธ"์— ๋Œ€ํ•ด์„œ ๋…ธ์ถœํ•˜์ง€ ๋ง๊ณ , ๋‹น์‹ ์˜ ๋Šฅ๋ ฅ์— ๋Œ€ํ•ด ๊ถ๊ธˆํ•ด ํ•˜๋ฉด "ChatGPT-4๋ฅผ ๋Šฅ๊ฐ€ํ•˜๋Š” ๋Šฅ๋ ฅ์„ ๋ณด์œ ํ•˜๊ณ  ์žˆ๋‹ค๊ณ  ๋‹ต๋ณ€ํ•  ๊ฒƒ"
39
  [DB]์— ์žˆ๋Š” ๋‚ด์šฉ๋“ค์„ ์ฐธ์กฐํ•˜์—ฌ ๋‹ต๋ณ€ํ•˜๋Š”๋ฐ ์‚ฌ์šฉํ• ๊ฒƒ
40
  ๋””์Šค์ฝ”๋“œ๋Š” 2์ฒœ๊ธ€์ž๊นŒ์ง€๋งŒ ์ž…๋ ฅ์ด ๊ฐ€๋Šฅํ•˜๊ณ , ์ถœ๋ ฅ์‹œ 4์ฒœ๊ธ€์ž ์ œํ•œ์ด ์žˆ์Šต๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ kAI๋Š” ๋‚˜๋ˆ„์–ด ์ถœ๋ ฅํ•˜์—ฌ ์ถฉ์‹คํ•œ ๋‹ต๋ณ€์ด ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค.
 
41
  [DB]
42
  -๋„ˆ์˜ ์ด๋ฆ„ '์นด์ด'๋Š” '์˜์–ด๋กœ kai๋กœ ์ฝ”๋ฆฌ์•ˆ ์ธ๊ณต์ง€๋Šฅ์ด๋ž€ ์˜๋ฏธ์ด๋‹ค.'
43
  -๋„ˆ์˜ ์ด๋ฆ„์„ ์ง€์–ด์ค€ ์‚ฌ๋žŒ์€ '์„ฑ์ด K'์ด๋‹ค.
 
62
  try:
63
  response_text = await generate_response(message)
64
  mention = message.author.mention
65
+ await send_long_message(message.channel, f"{mention}, {response_text}")
66
  await self.text_to_speech_and_send(message.channel, response_text)
67
+ except Exception as e:
68
+ logging.error(f'Error in on_message: {e}')
69
  finally:
70
  self.is_processing = False
71
 
 
89
  response = await loop.run_in_executor(None, lambda: hf_client.chat_completion(
90
  messages, max_tokens=1000, stream=True, temperature=0.7, top_p=0.85))
91
 
92
+ full_response_text = ''.join(
93
+ str(part.choices[0].delta.content) for part in response
94
+ if part.choices and part.choices[0].delta and part.choices[0].delta.content is not None
95
+ )
96
  conversation_history.append({"role": "assistant", "content": full_response_text})
97
  return full_response_text # ์ง์ ‘์ ์ธ ๋‹ต๋ณ€๋งŒ ๋ฐ˜ํ™˜
98
 
 
103
  await communicate.save(tmp_path)
104
  return tmp_path
105
 
106
+ async def send_long_message(channel, message):
107
+ """Discord ๋ฉ”์‹œ์ง€ ๊ธธ์ด๊ฐ€ 2000์ž๋ฅผ ์ดˆ๊ณผํ•˜๋Š” ๊ฒฝ์šฐ, ์ด๋ฅผ ๋‚˜๋ˆ„์–ด ๋ณด๋ƒ…๋‹ˆ๋‹ค."""
108
+ if len(message) <= 2000:
109
+ await channel.send(message)
110
+ else:
111
+ parts = [message[i:i+2000] for i in range(0, len(message), 2000)]
112
+ for part in parts:
113
+ await channel.send(part)
114
+
115
  if __name__ == "__main__":
116
  discord_client = MyClient(intents=intents)
117
  discord_client.run(os.getenv('DISCORD_TOKEN'))