vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: error handling: rename error fields to match OpenAI API

Browse source
This commit is contained in:
ZXED 2024-03-08 20:32:52 +03:00
parent 8a8aaee714
commit 444f32e370
No known key found for this signature in database
GPG key ID: 637FB44813DCFD66
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/error.h
View file

@ -7,18 +7,18 @@
class llama_error : public std::exception class llama_error : public std::exception
{ {
private: private:
std::string _id; std::string _type;
std::string _description; std::string _message;
public: public:
llama_error(const std::string & id, const std::string & description) llama_error(const std::string & type, const std::string & message)
: :
_id(id), _type(type),
_description(description) _message(message)
{ {
fprintf(stderr, "ERROR [%s]: %s\n", id.c_str(), description.c_str()); fprintf(stderr, "ERROR [%s]: %s\n", type.c_str(), message.c_str());
} }
inline const std::string & id() const { return _id; } inline const std::string & type() const { return _type; }
inline const std::string & description() const { return _description; } inline const std::string & message() const { return _message; }
}; };

6
examples/server/server.cpp
View file

@ -1215,15 +1215,15 @@ struct server_context {
{ {
return { return {
{ "error", { { "error", {
{ "id", error.id() }, { "type", error.type() },
{ "description", error.description() } { "message", error.message() }
} } } }
}; };
} }
void send_error(const server_task & task, const llama_error& error) void send_error(const server_task & task, const llama_error& error)
{ {
LOG_TEE("task %i - error: %s - %s\n", task.id, error.id().c_str(), error.description().c_str()); LOG_TEE("task %i - error: %s - %s\n", task.id, error.type().c_str(), error.message().c_str());
server_task_result res; server_task_result res;
res.id = task.id; res.id = task.id;
res.id_multi = task.id_multi; res.id_multi = task.id_multi;