serve from /props endpoint

Author: woof-dog

tools/server/public/index.html.gz

@@ -3862,11 +3862,6 @@ int main(int argc, char ** argv) {
         res_ok(res, health);
     };
 
-    const auto handle_default_config = [&](const httplib::Request &, httplib::Response & res) {
-        // default client-side config
-        res_ok(res, ctx_server.default_client_config);
-    };
-
     const auto handle_slots = [&](const httplib::Request & req, httplib::Response & res) {
         if (!params.endpoint_slots) {
             res_error(res, format_error_response("This server does not support slots endpoint. Start it with `--slots`", ERROR_TYPE_NOT_SUPPORTED));
@@ -4134,6 +4129,7 @@ int main(int argc, char ** argv) {
             { "bos_token",                   common_token_to_piece(ctx_server.ctx, llama_vocab_bos(ctx_server.vocab), /* special= */ true)},
             { "eos_token",                   common_token_to_piece(ctx_server.ctx, llama_vocab_eos(ctx_server.vocab), /* special= */ true)},
             { "build_info",                  build_info },
+            { "default_client_config",       ctx_server.default_client_config },
         };
         if (ctx_server.params_base.use_jinja) {
             if (auto tool_use_src = common_chat_templates_source(ctx_server.chat_templates.get(), "tool_use")) {
@@ -4846,7 +4842,6 @@ int main(int argc, char ** argv) {
 
     // register API routes
     svr->Get ("/health",              handle_health); // public endpoint (no API key check)
-    svr->Get ("/defaultConfig.json",  handle_default_config); // public endpoint (no API key check)
     svr->Get ("/metrics",             handle_metrics);
     svr->Get ("/props",               handle_props);
     svr->Post("/props",               handle_props_change);

tools/server/server.cpp

@@ -276,7 +276,7 @@ export default function SettingDialog({
   show: boolean;
   onClose: () => void;
 }) {
-  const { config, saveConfig } = useAppContext();
+  const { config, saveConfig, serverProps } = useAppContext();
   const [sectionIdx, setSectionIdx] = useState(0);
 
   // clone the config object to prevent direct mutation
@@ -287,15 +287,22 @@ export default function SettingDialog({
 
   // get default client settings
   useEffect(() => {
-    StorageUtils.setDefaultConfig().then((wasChanged: boolean) => {
-      if (wasChanged) {
-        console.log('Setting default config');
+    if (
+      serverProps &&
+      serverProps.default_client_config &&
+      Object.keys(serverProps.default_client_config).length > 0
+    ) {
+      if (StorageUtils.setDefaultConfig(serverProps.default_client_config)) {
+        console.log(
+          'Setting default config:',
+          serverProps.default_client_config
+        );
         const newConfig = StorageUtils.getConfig();
         saveConfig(newConfig);
         setLocalConfig(JSON.parse(JSON.stringify(newConfig)));
       }
-    });
-  }, []);
+    }
+  }, [serverProps, saveConfig]);
 
   const resetConfig = async () => {
     if (await showConfirm('Are you sure you want to reset all settings?')) {

tools/server/webui/src/components/SettingDialog.tsx

@@ -213,12 +213,9 @@ const StorageUtils = {
       localStorage.setItem('theme', theme);
     }
   },
-  async setDefaultConfig(): Promise<boolean> {
+  setDefaultConfig(defaultConfig: object | null | undefined): boolean {
     if (localStorage.getItem('config') === null) {
       try {
-        const response = await fetch('/defaultConfig.json');
-        const defaultConfig = await response.json();
-
         // Ensure there still is no config when we overwrite it
         if (localStorage.getItem('config') === null) {
           localStorage.setItem('config', JSON.stringify(defaultConfig));

tools/server/webui/src/utils/storage.ts

@@ -134,5 +134,6 @@ export interface LlamaCppServerProps {
     vision: boolean;
     audio: boolean;
   };
+  default_client_config: Record<string, number | string | boolean>;
   // TODO: support params
 }