mistpe commited on
Commit
5d02c42
1 Parent(s): dfa5b8c

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +54 -3
app.py CHANGED
@@ -180,6 +180,57 @@ def process_function_call(tool_call):
180
  else:
181
  return None
182
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
183
  @app.route('/api/wx', methods=['GET', 'POST'])
184
  def wechatai():
185
  if request.method == 'GET':
@@ -216,8 +267,8 @@ def wechatai():
216
  "content": json.dumps(function_result)
217
  })
218
 
219
- final_response = get_openai_response(session['messages'])
220
- response_content = final_response.content
221
  else:
222
  response_content = gpt_response.content
223
 
@@ -231,6 +282,6 @@ def wechatai():
231
  response_content = response_parts[0]
232
 
233
  return generate_response_xml(from_user_name, to_user_name, response_content)
234
-
235
  if __name__ == '__main__':
236
  app.run(host='0.0.0.0', port=7860, debug=True)
 
180
  else:
181
  return None
182
 
183
+ # @app.route('/api/wx', methods=['GET', 'POST'])
184
+ # def wechatai():
185
+ # if request.method == 'GET':
186
+ # return verify_wechat(request)
187
+ # else:
188
+ # xml_str = request.data
189
+ # user_message_content, from_user_name, to_user_name = getUserMessageContentFromXML(xml_str)
190
+
191
+ # if from_user_name not in user_sessions:
192
+ # user_sessions[from_user_name] = {'messages': [], 'pending_response': []}
193
+
194
+ # session = user_sessions[from_user_name]
195
+
196
+ # if user_message_content.lower() == '继续':
197
+ # if session['pending_response']:
198
+ # response_content = session['pending_response'].pop(0)
199
+ # if session['pending_response']:
200
+ # response_content += '\n\n回复"继续"获取下一部分。'
201
+ # else:
202
+ # response_content += '\n\n回复结束。'
203
+ # else:
204
+ # response_content = "没有待发送的消息。"
205
+ # else:
206
+ # session['messages'].append({"role": "user", "content": user_message_content})
207
+
208
+ # gpt_response = get_openai_response(session['messages'])
209
+
210
+ # if gpt_response.tool_calls:
211
+ # for tool_call in gpt_response.tool_calls:
212
+ # function_result = process_function_call(tool_call)
213
+ # session['messages'].append({
214
+ # "role": "function",
215
+ # "name": tool_call.function.name,
216
+ # "content": json.dumps(function_result)
217
+ # })
218
+
219
+ # final_response = get_openai_response(session['messages'])
220
+ # response_content = final_response.content
221
+ # else:
222
+ # response_content = gpt_response.content
223
+
224
+ # session['messages'].append({"role": "assistant", "content": response_content})
225
+
226
+ # response_parts = split_message(response_content)
227
+ # if len(response_parts) > 1:
228
+ # response_content = response_parts[0] + '\n\n回复"继续"获取下一部分。'
229
+ # session['pending_response'] = response_parts[1:]
230
+ # else:
231
+ # response_content = response_parts[0]
232
+
233
+ # return generate_response_xml(from_user_name, to_user_name, response_content)
234
  @app.route('/api/wx', methods=['GET', 'POST'])
235
  def wechatai():
236
  if request.method == 'GET':
 
267
  "content": json.dumps(function_result)
268
  })
269
 
270
+ # 直接使用 gpt_response 的内容,不再重新调用 API
271
+ response_content = gpt_response.content
272
  else:
273
  response_content = gpt_response.content
274
 
 
282
  response_content = response_parts[0]
283
 
284
  return generate_response_xml(from_user_name, to_user_name, response_content)
285
+
286
  if __name__ == '__main__':
287
  app.run(host='0.0.0.0', port=7860, debug=True)