server : relay error messages (#4131)

diff --git a/examples/server/public/completion.js b/examples/server/public/completion.js
index 0c9bd5f1021dbd2204688798d30e56c04eba073a..b9c442509a2fa2d7d230f5443287569adc81bf28 100644 (file)
--- a/examples/server/public/completion.js
+++ b/examples/server/public/completion.js
@@ -94,6 +94,10 @@ export async function* llama(prompt, params = {}, config = {}) {
               break;
             }
           }
+          if (result.error) {
+            result.error = JSON.parse(result.error);
+            console.error(`llama.cpp error: ${result.error.content}`);
+          }
         }
       }
     }

diff --git a/examples/server/server.cpp b/examples/server/server.cpp
index bb87b532b2c18f9f96812247acf865e83c0f7642..1f2c55f2dccdf96d2c0c04ea0921235a4422b623 100644 (file)
--- a/examples/server/server.cpp
+++ b/examples/server/server.cpp
@@ -2368,6 +2368,17 @@ int main(int argc, char **argv)
                                     break;
                                 }
                             } else {
+                                const std::string str =
+                                "error: " +
+                                result.result_json.dump(-1, ' ', false, json::error_handler_t::replace) +
+                                "\n\n";
+                                LOG_VERBOSE("data stream", {
+                                    { "to_send", str }
+                                });
+                                if (!sink.write(str.c_str(), str.size()))
+                                {
+                                    return false;
+                                }
                                 break;
                             }
                         }