Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: webui operates independently from aichat #527

Merged
merged 1 commit into from
May 20, 2024
Merged

feat: webui operates independently from aichat #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions assets/arena.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,10 @@
<script>
const QUERY = parseQueryString(location.search);
const NUM = parseInt(QUERY.num) || 2
const API_BASE = QUERY.api_base || ".";
const CHAT_COMPLETIONS_URL = API_BASE + "/v1/chat/completions";
const MODELS_API = API_BASE + "/v1/models";
const API_BASE = QUERY.api_base || "./v1";
const API_KEY = QUERY.api_key || "";
const CHAT_COMPLETIONS_URL = API_BASE + "/chat/completions";
const MODELS_API = API_BASE + "/models";
const MODEL_IDS_STORAGE_KEY = "__model_ids__";

document.addEventListener("alpine:init", () => {
Expand Down Expand Up @@ -566,7 +567,8 @@
const models = await fetchJSON(MODELS_API);
this.models = models;
} catch (err) {
console.error(err);
toast("No available model");
console.error("Failed to load models", err);
}
let model_ids = []
try {
Expand Down Expand Up @@ -695,6 +697,7 @@
if (event.shiftKey) {
return;
}
event.preventDefault();
this.handleAsk();
},

Expand Down Expand Up @@ -765,7 +768,7 @@
chat.askAbortController = new AbortController();
chat.shouldScrollChatBodyToBottom = true;
this.$nextTick(() => {
this.autoScrollChatBodyToBottom(index);
this.autoScrollChatBodyToBottom(index);
});
const lastMessage = chat.messages[chat.messages.length - 1];
const body = this.buildBody(index);
Expand Down Expand Up @@ -831,7 +834,7 @@
}

async function fetchJSON(url) {
const res = await fetch(url);
const res = await fetch(url, { headers: getHeaders() });
const data = await res.json()
return data.data;
}
Expand All @@ -841,9 +844,7 @@
const response = await fetch(url, {
method: "POST",
signal,
headers: {
"content-type": "application/json",
},
headers: getHeaders(),
body: JSON.stringify(body),
});

Expand Down Expand Up @@ -891,6 +892,16 @@
}
}

function getHeaders() {
const headers = {
"content-type": "application/json",
};
if (API_KEY) {
headers["authorization"] = `Bearer ${API_KEY}`;
}
return headers
}

function retrieveModel(models, id) {
const model = models.find(model => model.id === id);
if (!model) return {};
Expand Down
44 changes: 29 additions & 15 deletions assets/playground.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,11 @@
</div>
<script>
const QUERY = parseQueryString(location.search);
const API_BASE = QUERY.api_base || ".";
const CHAT_COMPLETIONS_URL = API_BASE + "/v1/chat/completions";
const MODELS_API = API_BASE + "/v1/models";
const ROLES_API = API_BASE + "/v1/roles";
const API_BASE = QUERY.api_base || "./v1";
const API_KEY = QUERY.api_key || "";
const CHAT_COMPLETIONS_URL = API_BASE + "/chat/completions";
const MODELS_API = API_BASE + "/models";
const ROLES_API = API_BASE + "/roles";
const SETTINGS_STORAGE_KEY = "__settings__";

document.addEventListener("alpine:init", () => {
Expand Down Expand Up @@ -739,13 +740,17 @@
settings: defaultSettings,

async init() {
try {
const [models, roles] = await Promise.all([MODELS_API, ROLES_API].map(url => fetchJSON(url)));
this.models = models;
this.roles.push(...roles);
} catch (err) {
console.error(err);
}
await Promise.all([
fetchJSON(MODELS_API).then(models => {
this.models = models;
}).catch(err => {
toast("No model available");
console.error("Failed to load models", err);
}),
fetchJSON(ROLES_API).then(roles => {
this.roles.push(...roles.filter(v => !!v.prompt));
}).catch(() => { }),
])
this.$watch("input", () => this.autosizeInput(this.$refs.input));
this.$watch("settings", () => {
localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(this.settings));
Expand Down Expand Up @@ -857,6 +862,7 @@
if (event.shiftKey) {
return;
}
event.preventDefault();
this.handleAsk();
},

Expand Down Expand Up @@ -1038,7 +1044,7 @@
}

async function fetchJSON(url) {
const res = await fetch(url);
const res = await fetch(url, { headers: getHeaders() });
const data = await res.json()
return data.data;
}
Expand All @@ -1048,9 +1054,7 @@
const response = await fetch(url, {
method: "POST",
signal,
headers: {
"content-type": "application/json",
},
headers: getHeaders(),
body: JSON.stringify(body),
});

Expand Down Expand Up @@ -1098,6 +1102,16 @@
}
}

function getHeaders() {
const headers = {
"content-type": "application/json",
};
if (API_KEY) {
headers["authorization"] = `Bearer ${API_KEY}`;
}
return headers
}

function retrieveModel(models, id) {
const model = models.find(model => model.id === id);
if (!model) return {};
Expand Down