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

server: public: fix api_url on non-index pages

Browse source
This commit is contained in:
EZForever 2024-07-18 13:28:03 +08:00
parent e02b597be3
commit f1eecf1add
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/server/public/completion.js
View file

@ -21,7 +21,7 @@ let generation_settings = null;
// //
export async function* llama(prompt, params = {}, config = {}) { export async function* llama(prompt, params = {}, config = {}) {
let controller = config.controller; let controller = config.controller;
const api_url = config.api_url || ""; const api_url = config.api_url?.replace(/\/+$/, '') || "";
if (!controller) { if (!controller) {
controller = new AbortController(); controller = new AbortController();
@ -196,7 +196,7 @@ export const llamaComplete = async (params, controller, callback) => {
// Get the model info from the server. This is useful for getting the context window and so on. // Get the model info from the server. This is useful for getting the context window and so on.
export const llamaModelInfo = async (config = {}) => { export const llamaModelInfo = async (config = {}) => {
if (!generation_settings) { if (!generation_settings) {
const api_url = config.api_url || ""; const api_url = config.api_url?.replace(/\/+$/, '') || "";
const props = await fetch(`${api_url}/props`).then(r => r.json()); const props = await fetch(`${api_url}/props`).then(r => r.json());
generation_settings = props.default_generation_settings; generation_settings = props.default_generation_settings;
} }

2
examples/server/public/index.html
View file

@ -479,7 +479,7 @@
throw new Error("already running"); throw new Error("already running");
} }
controller.value = new AbortController(); controller.value = new AbortController();
for await (const chunk of llama(prompt, llamaParams, { controller: controller.value, api_url: location.pathname.replace(/\/+$/, '') })) { for await (const chunk of llama(prompt, llamaParams, { controller: controller.value, api_url: URL.parse('.', document.baseURI).href })) {
const data = chunk.data; const data = chunk.data;
if (data.stop) { if (data.stop) {