anisrashidov commited on
Commit
aeb7261
ยท
verified ยท
1 Parent(s): a27e4e5

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -3
app.py CHANGED
@@ -74,14 +74,22 @@ def get_naver_answers( message: str ):
74
  naver_start_time = time.time()
75
  response = gemini_client.models.generate_content(
76
  model = genai_model,
77
- contents=f"{message}\n ์œ„์˜ ๋‚ด์šฉ์„ ์งง์€ ์ œ๋ชฉ์œผ๋กœ ์š”์•ฝํ•ฉ๋‹ˆ๋‹ค. ์ œ๋ชฉ๋งŒ ๋ณด์—ฌ์ฃผ์„ธ์š”. ๋Œ€๋‹ตํ•˜์ง€ ๋งˆ์„ธ์š”",
78
  )
79
  query = response.text
80
  print( "Query: ", query)
81
 
82
  context = get_answers( query )
83
 
84
- sorted_answers = ['. '.join(answer['answers']) for answer in context]
 
 
 
 
 
 
 
 
85
  naver_end_time = time.time()
86
  print(f"Time taken to extract from Naver: { naver_end_time - naver_start_time } seconds")
87
  document = '\n'.join(sorted_answers)
@@ -254,12 +262,14 @@ def compare_answers(message: str):
254
  return results
255
 
256
  def chatFunction( message, history ):
257
- content = f'์•„๋ž˜ ๋ฌธ์„œ๋ฅผ ๋ฐ”ํƒ•์œผ๋กœ ์งˆ๋ฌธ์— ๋‹ตํ•˜์„ธ์š”. ๋‹ต๋ณ€์—์„œ ์งˆ๋ฌธ์„ ๋”ฐ๋ผ ์ถœ๋ ฅ ํ•˜์ง€ ๋งˆ์„ธ์š”. ๋‹ต๋ณ€์€ ํ•œ๊ตญ์–ด๋กœ๋งŒ ํ•ด์ฃผ์„ธ์š”. ์ฐพ์€ Naver ๋ฌธ์„œ์™€ ๋‹ค๋ฅธ ๋ฌธ์„œ์—์„œ ๋‹ต๋ณ€์ด ์—†๋Š” ๋‚ด์šฉ์€ ์ ˆ๋Œ€ ์ถœ๋ ฅํ•˜์ง€ ๋งˆ์„ธ์š” \n ์งˆ๋ฌธ: {message}\n ๋ฌธ์„œ: '
258
  naver_docs, naver_time_taken = get_naver_answers( message )
259
 
260
  start_time = time.time()
261
  content += "\n Naver ๋ฌธ์„œ: " + naver_docs
262
 
 
 
263
  completion = gpt_client.chat.completions.create(
264
  model="gpt-4o-mini",
265
  messages=[
 
74
  naver_start_time = time.time()
75
  response = gemini_client.models.generate_content(
76
  model = genai_model,
77
+ contents=f"{message}\n ์œ„์˜ ๋‚ด์šฉ์„ ์งง์€ ์ œ๋ชฉ์œผ๋กœ ์š”์•ฝํ•ฉ๋‹ˆ๋‹ค. ์ œ๋ชฉ๋งŒ ๋ณด์—ฌ์ฃผ์„ธ์š”. ๋Œ€๋‹ตํ•˜์ง€ ๋งˆ์„ธ์š”. ํ•œ๊ตญ์–ด๋กœ๋งŒ ๋‹ต๋ณ€ํ•ด์ฃผ์„ธ์š”!!!",
78
  )
79
  query = response.text
80
  print( "Query: ", query)
81
 
82
  context = get_answers( query )
83
 
84
+ answer_count = 0
85
+ sorted_answers = []
86
+ for answer in context:
87
+ curr = '. '.join(answer['answers'])
88
+ answer_count += len(curr)
89
+ sorted_answers.append(curr)
90
+ if answer_count > 55000:
91
+ break
92
+ # sorted_answers = ['. '.join(answer['answers']) for answer in context]
93
  naver_end_time = time.time()
94
  print(f"Time taken to extract from Naver: { naver_end_time - naver_start_time } seconds")
95
  document = '\n'.join(sorted_answers)
 
262
  return results
263
 
264
  def chatFunction( message, history ):
265
+ content = f'์•„๋ž˜ ๋ฌธ์„œ๋ฅผ ๋ฐ”ํƒ•์œผ๋กœ ์งˆ๋ฌธ์— ๋‹ตํ•˜์„ธ์š”. ๋‹ต๋ณ€์—์„œ ์งˆ๋ฌธ์„ ๋”ฐ๋ผ ์ถœ๋ ฅ ํ•˜์ง€ ๋งˆ์„ธ์š”. ๋‹ต๋ณ€์€ ํ•œ๊ตญ์–ด๋กœ๋งŒ ํ•ด์ฃผ์„ธ์š”! ์ฐพ์€ Naver ๋ฌธ์„œ์™€ ๋‹ค๋ฅธ ๋ฌธ์„œ์—์„œ ๋‹ต๋ณ€์ด ์—†๋Š” ๋‚ด์šฉ์€ ์ ˆ๋Œ€ ์ถœ๋ ฅํ•˜์ง€ ๋งˆ์„ธ์š” \n ์งˆ๋ฌธ: {message}\n ๋ฌธ์„œ: '
266
  naver_docs, naver_time_taken = get_naver_answers( message )
267
 
268
  start_time = time.time()
269
  content += "\n Naver ๋ฌธ์„œ: " + naver_docs
270
 
271
+ print( ">>> Length: ", len(naver_docs) )
272
+
273
  completion = gpt_client.chat.completions.create(
274
  model="gpt-4o-mini",
275
  messages=[