Colby commited on
Commit
348444e
·
verified ·
1 Parent(s): 3b513a4

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +7 -10
app.py CHANGED
@@ -141,7 +141,7 @@ def merlin_chat(message, history):
141
  chat_list.insert(0,system_msg)
142
  user_msg = {'role': 'user', 'content': message}
143
  chat_list.append(user_msg)
144
- prompt = json.dumps(chat_list)[:-1]
145
  for attempt in range(3):
146
  result = generate_text(prompt, model_path, parameters, headers)
147
  response = result[0]
@@ -149,17 +149,14 @@ def merlin_chat(message, history):
149
  start = 0
150
  end = 0
151
  cleanStr = response.lstrip()
152
- start = cleanStr.find('{')
153
- if start<=0:
154
- continue
155
- end = cleanStr.find('}') + 1
156
  if end<=0:
157
  continue
158
- cleanStr = cleanStr[start:end]
159
- message = json.loads(cleanStr)
160
- if message['role'] != 'assistant':
161
- continue
162
- return message['content']
163
  return "🤔"
164
 
165
  gr.ChatInterface(merlin_chat).launch()
 
141
  chat_list.insert(0,system_msg)
142
  user_msg = {'role': 'user', 'content': message}
143
  chat_list.append(user_msg)
144
+ prompt = json.dumps(chat_list)[:-1] + ",{\"role\": \"assistant\", \"content\": \""
145
  for attempt in range(3):
146
  result = generate_text(prompt, model_path, parameters, headers)
147
  response = result[0]
 
149
  start = 0
150
  end = 0
151
  cleanStr = response.lstrip()
152
+ #start = cleanStr.find('{')
153
+ #if start<=0:
154
+ # continue
155
+ end = cleanStr.find('\"')
156
  if end<=0:
157
  continue
158
+ cleanStr = cleanStr[:end]
159
+ return message['cleanStr']
 
 
 
160
  return "🤔"
161
 
162
  gr.ChatInterface(merlin_chat).launch()