decouple server_routes and server_http

Author: ngxson

tools/server/server-context.cpp

@@ -3172,9 +3172,8 @@ void server_routes::init_routes() {
 
     this->get_models = [this](const server_http_req &) {
         auto res = std::make_unique<server_res_generator>(ctx_server);
-        bool is_model_ready = ctx_http.is_ready.load();
         json model_meta = nullptr;
-        if (is_model_ready) {
+        if (is_ready()) {
             model_meta = ctx_server.model_meta();
         }
         bool has_mtmd = ctx_server.mctx != nullptr;

tools/server/server-context.h

@@ -41,8 +41,8 @@ struct server_context {
 struct server_res_generator;
 
 struct server_routes {
-    server_routes(const common_params & params, server_context & ctx_server, server_http_context & ctx_http)
-            : params(params), ctx_server(*ctx_server.impl), ctx_http(ctx_http) {
+    server_routes(const common_params & params, server_context & ctx_server, std::function<bool()> is_ready = []() { return true; })
+            : params(params), ctx_server(*ctx_server.impl), is_ready(is_ready) {
         init_routes();
     }
 
@@ -79,5 +79,5 @@ struct server_routes {
 
     const common_params & params;
     server_context_impl & ctx_server;
-    server_http_context & ctx_http; // for reading is_ready
+    std::function<bool()> is_ready;
 };

tools/server/server.cpp

@@ -99,7 +99,7 @@ int main(int argc, char ** argv) {
     //
 
     // register API routes
-    server_routes routes(params, ctx_server, ctx_http);
+    server_routes routes(params, ctx_server, [&ctx_http]() { return ctx_http.is_ready.load(); });
 
     ctx_http.get ("/health",              ex_wrapper(routes.get_health)); // public endpoint (no API key check)
     ctx_http.get ("/v1/health",           ex_wrapper(routes.get_health)); // public endpoint (no API key check)