rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix JSDoc + lint + readability

This commit is contained in:
Cohee 2023-12-14 20:05:27 +02:00
parent 47c71a62f3
commit d1be9d5347
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/endpoints/backends/chat-completions.js
View File

@ -1,5 +1,6 @@
const express = require('express');
const fetch = require('node-fetch').default;
const { Readable } = require('stream');
const { jsonParser } = require('../../express-common');
const { CHAT_COMPLETION_SOURCES, MAKERSUITE_SAFETY } = require('../../constants');
@ -151,20 +152,16 @@ async function sendScaleRequest(request, response) {
* @param {express.Request} request Express request
* @param {express.Response} response Express response
*/
/**
* @param {express.Request} request
* @param {express.Response} response
*/
async function sendMakerSuiteRequest(request, response) {
const api_key_makersuite = readSecret(SECRET_KEYS.MAKERSUITE);
const apiKey = readSecret(SECRET_KEYS.MAKERSUITE);
if (!api_key_makersuite) {
if (!apiKey) {
console.log('MakerSuite API key is missing.');
return response.status(400).send({ error: true });
}
const google_model = request.body.model;
const should_stream = request.body.stream;
const model = request.body.model;
const stream = request.body.stream;
const generationConfig = {
stopSequences: request.body.stop,
@ -176,7 +173,7 @@ async function sendMakerSuiteRequest(request, response) {
};
const body = {
contents: convertGooglePrompt(request.body.messages, google_model),
contents: convertGooglePrompt(request.body.messages, model),
safetySettings: MAKERSUITE_SAFETY,
generationConfig: generationConfig,
};
@ -188,7 +185,7 @@ async function sendMakerSuiteRequest(request, response) {
controller.abort();
});
const generateResponse = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${google_model}:${should_stream ? 'streamGenerateContent' : 'generateContent'}?key=${api_key_makersuite}`, {
const generateResponse = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/${model}:${stream ? 'streamGenerateContent' : 'generateContent'}?key=${apiKey}`, {
body: JSON.stringify(body),
method: 'POST',
headers: {
@ -198,7 +195,7 @@ async function sendMakerSuiteRequest(request, response) {
timeout: 0,
});
// have to do this because of their busted ass streaming endpoint
if (should_stream) {
if (stream) {
try {
let partialData = '';
generateResponse.body.on('data', (data) => {
@ -221,7 +218,7 @@ async function sendMakerSuiteRequest(request, response) {
});
request.socket.on('close', function () {
generateResponse.body.destroy();
if (generateResponse.body instanceof Readable) generateResponse.body.destroy();
response.end();
});

6
src/endpoints/prompt-converters.js
View File

@ -72,6 +72,12 @@ function convertClaudePrompt(messages, addHumanPrefix, addAssistantPostfix, with
return requestPrompt;
}
/**
* Convert a prompt from the ChatML objects to the format used by Google MakerSuite models.
* @param {object[]} messages Array of messages
* @param {string} model Model name
* @returns {object[]} Prompt for Google MakerSuite models
*/
function convertGooglePrompt(messages, model) {
const contents = [];
let lastRole = '';