Merge pull request #872 from 50h100a/kai-fmt

public/index.html

@@ -2545,6 +2545,9 @@
                             <label for="spoiler_free_mode"><input id="spoiler_free_mode" type="checkbox" />
                                 <span data-i18n="Spoiler Free Mode">Spoiler Free Mode</span>
                             </label>
+                            <label for="relaxed_api_urls" title="Reduce the formatting requirements on API URLS"><input id="relaxed_api_urls" type="checkbox" />
+                                <span data-i18n="Relaxed API URLS">Relaxed API URLS</span>
+                            </label>
 
                             <div class="inline-drawer wide100p flexFlowColumn">
                                 <div class="inline-drawer-toggle inline-drawer-header">

public/scripts/kai-settings.js

@@ -4,6 +4,10 @@ import {
     getStoppingStrings,
 } from "../script.js";
 
+import {
+    power_user,
+} from "./power-user.js";
+
 export {
     kai_settings,
     loadKoboldSettings,
@@ -35,13 +39,13 @@ const MIN_STREAMING_KCPPVERSION = '1.30';
 function formatKoboldUrl(value) {
     try {
         const url = new URL(value);
+        if (!power_user.relaxed_api_urls) {
             url.pathname = '/api';
+        }
         return url.toString();
-    }
+    } catch { } // Just using URL as a validation check
-    catch {
     return null;
 }
-}
 
 function loadKoboldSettings(preset) {
     for (const name of Object.keys(kai_settings)) {

public/scripts/power-user.js

@@ -164,6 +164,7 @@ let power_user = {
     prefer_character_jailbreak: true,
     continue_on_send: false,
     trim_spaces: true,
+    relaxed_api_urls: false,
 
     instruct: {
         enabled: false,
@@ -673,6 +674,7 @@ function loadPowerUserSettings(settings, data) {
         power_user.chat_width = 50;
     }
 
+    $('#relaxed_api_urls').prop("checked", power_user.relaxed_api_urls);
     $('#trim_spaces').prop("checked", power_user.trim_spaces);
     $('#continue_on_send').prop("checked", power_user.continue_on_send);
     $('#auto_swipe').prop("checked", power_user.auto_swipe);
@@ -1982,6 +1984,12 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $("#relaxed_api_urls").on("input", function () {
+        const value = !!$(this).prop('checked');
+        power_user.relaxed_api_urls = value;
+        saveSettingsDebounced();
+    });
+
     $('#spoiler_free_mode').on('input', function () {
         power_user.spoiler_free_mode = !!$(this).prop('checked');
         switchSpoilerMode();

public/scripts/textgen-settings.js

@@ -6,6 +6,10 @@ import {
     setGenerationParamsFromPreset,
 } from "../script.js";
 
+import {
+    power_user,
+} from "./power-user.js";
+
 export {
     textgenerationwebui_settings,
     loadTextGenSettings,
@@ -98,10 +102,11 @@ function selectPreset(name) {
 function formatTextGenURL(value) {
     try {
         const url = new URL(value);
-        if (url.pathname.endsWith('/api')) {
+        if (!power_user.relaxed_api_urls) {
-            return url.toString();
+            url.pathname = '/api';
         }
-    } catch { } // Try and Catch both fall through to the same return.
+        return url.toString();
+    } catch { } // Just using URL as a validation check
     return null;
 }