|
@@ -82,11 +82,11 @@ def recommend(headlines, category):
|
|
"""
|
|
"""
|
|
}
|
|
}
|
|
chat_messages.append(json_payload)
|
|
chat_messages.append(json_payload)
|
|
- json_response = app.openai_client.chat.completions.create(model="gpt-3.5-turbo-1106",
|
|
|
|
|
|
+ json_response = app.openai_client.chat.completions.create(model="gpt-3.5-turbo",
|
|
messages=chat_messages,
|
|
messages=chat_messages,
|
|
response_format={"type": "json_object"}
|
|
response_format={"type": "json_object"}
|
|
)
|
|
)
|
|
- return json.loads(json_response.choices[0].message.content)
|
|
|
|
|
|
+ result = {"status": "ok", "message": json.loads(json_response.choices[0].message.content)}
|
|
except openai.APITimeoutError as e:
|
|
except openai.APITimeoutError as e:
|
|
app.logger.exception("error")
|
|
app.logger.exception("error")
|
|
result = {"status": "error", "message": e.message}, 408
|
|
result = {"status": "error", "message": e.message}, 408
|
|
@@ -96,6 +96,7 @@ def recommend(headlines, category):
|
|
except Exception as error_print:
|
|
except Exception as error_print:
|
|
app.logger.exception("error")
|
|
app.logger.exception("error")
|
|
result = {"status": "error", "message": "Please try again"}, 405
|
|
result = {"status": "error", "message": "Please try again"}, 405
|
|
|
|
+ return result
|
|
|
|
|
|
|
|
|
|
def vision(message, image_url=None, image_b64=None):
|
|
def vision(message, image_url=None, image_b64=None):
|
|
@@ -124,16 +125,17 @@ def vision(message, image_url=None, image_b64=None):
|
|
messages=chat_messages,
|
|
messages=chat_messages,
|
|
max_tokens=500
|
|
max_tokens=500
|
|
)
|
|
)
|
|
- return {"role": "assistant", "content": json_response.choices[0].message.content}
|
|
|
|
|
|
+ result = {"role": "assistant", "content": json_response.choices[0].message.content}
|
|
except openai.APITimeoutError as e:
|
|
except openai.APITimeoutError as e:
|
|
app.logger.exception("error")
|
|
app.logger.exception("error")
|
|
result = {"status": "error", "message": e.message}, 408
|
|
result = {"status": "error", "message": e.message}, 408
|
|
except openai.NotFoundError as e:
|
|
except openai.NotFoundError as e:
|
|
app.logger.exception("error")
|
|
app.logger.exception("error")
|
|
result = {"status": "error", "message": json.loads(e.response.content)['error']['message']}, e.status_code
|
|
result = {"status": "error", "message": json.loads(e.response.content)['error']['message']}, e.status_code
|
|
- except Exception as error_print:
|
|
|
|
|
|
+ except Exception as e:
|
|
app.logger.exception("error")
|
|
app.logger.exception("error")
|
|
result = {"status": "error", "message": "Please try again"}, 405
|
|
result = {"status": "error", "message": "Please try again"}, 405
|
|
|
|
+ return result
|
|
|
|
|
|
|
|
|
|
@app.route('/gpt', methods=['POST'])
|
|
@app.route('/gpt', methods=['POST'])
|